From patchwork Thu Oct 18 15:03:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12344 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0C6EE23DE1 for ; Thu, 18 Oct 2012 15:03:37 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id BEC2AA1885E for ; Thu, 18 Oct 2012 15:03:36 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so6192785iag.11 for ; Thu, 18 Oct 2012 08:03:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=I5WVBNvle+gljOEWhWmTJT2d3hePJ6sAwcBXfduaBEE=; b=pgnMRgCG0v1HtQLbsqVDPd+KmrHtJ1Rwl1FCTQKuBw7TpZF0/T3XUXnfSdW+l0e08/ BDLUaUqqkDgsHbU3kpWEURdCC3N8P5mhyxVSVZeKFYo0Bprhs9GFpF0r/RwOCKoWOLv6 ZTy9FfcJcV7XZiqZuHdR9edsn+kWmAvFy6YUYRaMpWVxbStUAjHbBo9uJz4dq+dEMCff vTZDvAhRhAroyYpteR/RyCddQoZwf9XDb763tYX76Nhk2ahGoGLFOV0J2uSLEN9Y+zhH iOGRwI0CyP5CurM3z6rL59c0R6Hba147q4kwYoFiq5cq65CduEjLfcQ6tJWkOglEeAZ4 o8ZQ== Received: by 10.50.140.97 with SMTP id rf1mr3459718igb.70.1350572616009; Thu, 18 Oct 2012 08:03:36 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp1088507igt; Thu, 18 Oct 2012 08:03:35 -0700 (PDT) Received: by 10.180.87.34 with SMTP id u2mr12011538wiz.3.1350572614696; Thu, 18 Oct 2012 08:03:34 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id q42si27767786wei.6.2012.10.18.08.03.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 08:03:34 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TOrdE-0006Jr-HZ; Thu, 18 Oct 2012 16:03:32 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, patches@linaro.org Subject: [PATCH] ui/vnc-jobs.c: Fix minor typos in comments Date: Thu, 18 Oct 2012 16:03:32 +0100 Message-Id: <1350572612-24268-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQneR/Gc6oeqoOZSo3WRkX8XTjiAezSUVJtBPmedkDTifsLgs+jTsXindTkq+SdI570cBLJ/ Fix some minor typos/grammar errors in comments. Signed-off-by: Peter Maydell --- ui/vnc-jobs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index 087b84d..84b074e 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -33,21 +33,21 @@ /* * Locking: * - * There is three levels of locking: + * There are three levels of locking: * - jobs queue lock: for each operation on the queue (push, pop, isEmpty?) * - VncDisplay global lock: mainly used for framebuffer updates to avoid * screen corruption if the framebuffer is updated - * while the worker is doing something. + * while the worker is doing something. * - VncState::output lock: used to make sure the output buffer is not corrupted - * if two threads try to write on it at the same time + * two threads try to write on it at the same time * - * While the VNC worker thread is working, the VncDisplay global lock is hold - * to avoid screen corruptions (this does not block vnc_refresh() because it - * uses trylock()) but the output lock is not hold because the thread work on + * While the VNC worker thread is working, the VncDisplay global lock is held + * to avoid screen corruption (this does not block vnc_refresh() because it + * uses trylock()) but the output lock is not held because the thread works on * its own output buffer. * When the encoding job is done, the worker thread will hold the output lock * and copy its output buffer in vs->output. -*/ + */ struct VncJobQueue { QemuCond cond; @@ -62,7 +62,7 @@ typedef struct VncJobQueue VncJobQueue; /* * We use a single global queue, but most of the functions are - * already reetrant, so we can easilly add more than one encoding thread + * already reentrant, so we can easily add more than one encoding thread */ static VncJobQueue *queue;