From patchwork Thu Oct 18 16:40:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12347 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 ADB0223F6F for ; Thu, 18 Oct 2012 16:41:00 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id D93F1A18B97 for ; Thu, 18 Oct 2012 16:40:59 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so13569457iej.11 for ; Thu, 18 Oct 2012 09:40:59 -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=4mUu7cKq2j4JQ+2lm7XTHMk9sYAHSw5kI9/FYZmaIbQ=; b=iENh8ar+a5ZQH4j7E76aZLPVjhhIY26nO5+KbsUeyK72E7dT6hqV3mtO0oaYEl2RLs XF1/rHboQcot5eI7eXmxzYMRHJojdHhny8wRNKuytd8CyGfwqomDWNb/NLkyOtzEGi8H 985DbQ7nB6wECdHqMwWjHmn1WyvaG1LJIfjgYVNUWWxl8VO1FKQX4IZX1OQzIH387CYD xTyCgpaHwkYDmv7JLX+yjfMh7vVgvR9RycACuQWKqQIZ4NB4RE0TeOeP4TLDTQho9nI+ +GtC3D5GfIf+cNlh3Z203b92FlRQPq1mMU5piC/a/dPHCBYT+BDu/MpThYdgQWmDgvKH 2Z6g== Received: by 10.42.57.10 with SMTP id b10mr4024354ich.54.1350578459302; Thu, 18 Oct 2012 09:40:59 -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 n20csp1103737igt; Thu, 18 Oct 2012 09:40:58 -0700 (PDT) Received: by 10.216.217.38 with SMTP id h38mr11778841wep.82.1350578457940; Thu, 18 Oct 2012 09:40:57 -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 h60si28001644wea.78.2012.10.18.09.40.57 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 09:40:57 -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 1TOt9R-0006LT-2H; Thu, 18 Oct 2012 17:40:53 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, patches@linaro.org, Stefan Weil Subject: [PATCH v2] ui/vnc-jobs.c: Fix minor typos in comments Date: Thu, 18 Oct 2012 17:40:53 +0100 Message-Id: <1350578453-24368-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQk18SIDMyc+CqBDcRvSoms9iepcclMjLB+NREy6mmZtSxW0ptZ+HMowG3tFW5blz/sxsAOy Fix some minor typos/grammar errors in comments. Signed-off-by: Peter Maydell --- v1->v2: reinstated carelessly dropped 'if', noted by Stefan Weil. 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..3c592b3 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 + * if 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;