From patchwork Sat Jul 21 12:27:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 172431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D5A9E2C01CC for ; Sat, 21 Jul 2012 22:34:30 +1000 (EST) Received: from localhost ([::1]:57811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsYmy-0001pB-5W for incoming@patchwork.ozlabs.org; Sat, 21 Jul 2012 08:28:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsYmI-0008FQ-7J for qemu-devel@nongnu.org; Sat, 21 Jul 2012 08:27:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsYmG-0004sH-Ji for qemu-devel@nongnu.org; Sat, 21 Jul 2012 08:27:22 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:58696) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsYmG-0004sC-9p for qemu-devel@nongnu.org; Sat, 21 Jul 2012 08:27:20 -0400 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 21 Jul 2012 13:27:19 +0100 Received: from d06nrmr1307.portsmouth.uk.ibm.com (9.149.38.129) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 21 Jul 2012 13:27:16 +0100 Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6LCRG6v2449602 for ; Sat, 21 Jul 2012 13:27:16 +0100 Received: from d06av12.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6LCRFZe012206 for ; Sat, 21 Jul 2012 06:27:16 -0600 Received: from localhost (sig-9-146-168-221.uk.ibm.com [9.146.168.221]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6LCRF3x012197; Sat, 21 Jul 2012 06:27:15 -0600 From: Stefan Hajnoczi To: Anthony Liguori Date: Sat, 21 Jul 2012 13:27:05 +0100 Message-Id: <1342873625-7979-7-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342873625-7979-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1342873625-7979-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12072112-4966-0000-0000-000003019E94 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.106 Cc: Stefan Weil , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 6/6] Fix some more Qemus in documentation and help text X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stefan Weil Hopefully they will be eliminated one day. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- docs/usb-storage.txt | 2 +- qemu-options.hx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/usb-storage.txt b/docs/usb-storage.txt index ff97559..e58e849 100644 --- a/docs/usb-storage.txt +++ b/docs/usb-storage.txt @@ -2,7 +2,7 @@ qemu usb storage emulation -------------------------- -Qemu has two emulations for usb storage devices. +QEMU has two emulations for usb storage devices. Number one emulates the classic bulk-only transport protocol which is used by 99% of the usb sticks on the marked today and is called diff --git a/qemu-options.hx b/qemu-options.hx index 97245a3..dc68e15 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1439,7 +1439,7 @@ Forward guest TCP connections to the IP address @var{server} on port @var{port} to the character device @var{dev} or to a program executed by @var{cmd:command} which gets spawned for each connection. This option can be given multiple times. -You can either use a chardev directly and have that one used throughout Qemu's +You can either use a chardev directly and have that one used throughout QEMU's lifetime, like in the following example: @example @@ -1449,7 +1449,7 @@ qemu -net user,guestfwd=tcp:10.0.2.100:1234-tcp:10.10.1.1:4321 [...] @end example Or you can execute a command on every TCP connection established by the guest, -so that Qemu behaves similar to an inetd process for that virtual server: +so that QEMU behaves similar to an inetd process for that virtual server: @example # call "netcat 10.10.1.1 4321" on every TCP connection to 10.0.2.100:1234