From patchwork Wed Feb 13 18:49:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 220237 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 5F4262C0089 for ; Thu, 14 Feb 2013 06:42:30 +1100 (EST) Received: from localhost ([::1]:38977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5hPH-0000fB-U0 for incoming@patchwork.ozlabs.org; Wed, 13 Feb 2013 13:50:11 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5hOx-0000HU-6L for qemu-devel@nongnu.org; Wed, 13 Feb 2013 13:49:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U5hOs-0003XE-Py for qemu-devel@nongnu.org; Wed, 13 Feb 2013 13:49:51 -0500 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:38146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U5hOs-0003Wp-F8 for qemu-devel@nongnu.org; Wed, 13 Feb 2013 13:49:46 -0500 Received: from blackfin.pond.sub.org (p5B32AE19.dip.t-dialin.net [91.50.174.25]) by oxygen.pond.sub.org (Postfix) with ESMTPA id CDDBCA62D7; Wed, 13 Feb 2013 19:49:44 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9C9B5200B1; Wed, 13 Feb 2013 19:49:43 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 13 Feb 2013 19:49:42 +0100 Message-Id: <1360781383-28635-7-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1360781383-28635-1-git-send-email-armbru@redhat.com> References: <1360781383-28635-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: aliguori@us.ibm.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH for-1.4 6/7] doc help: A few options are under inappropriate headings, fix 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 --device is under heading "USB options". --name and --uuid are under "Virtual File system pass-through options". Move all three to "Standard options". Signed-off-by: Markus Armbruster --- qemu-options.hx | 80 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 071b1b3..a252908 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -535,6 +535,45 @@ Enable virtio balloon device (default), optionally with PCI address @var{addr}. ETEXI +DEF("device", HAS_ARG, QEMU_OPTION_device, + "-device driver[,prop[=value][,...]]\n" + " add device (based on driver)\n" + " prop=value,... sets driver properties\n" + " use '-device help' to print all possible drivers\n" + " use '-device driver,help' to print all possible properties\n", + QEMU_ARCH_ALL) +STEXI +@item -device @var{driver}[,@var{prop}[=@var{value}][,...]] +@findex -device +Add device @var{driver}. @var{prop}=@var{value} sets driver +properties. Valid properties depend on the driver. To get help on +possible drivers and properties, use @code{-device help} and +@code{-device @var{driver},help}. +ETEXI + +DEF("name", HAS_ARG, QEMU_OPTION_name, + "-name string1[,process=string2]\n" + " set the name of the guest\n" + " string1 sets the window title and string2 the process name (on Linux)\n", + QEMU_ARCH_ALL) +STEXI +@item -name @var{name} +@findex -name +Sets the @var{name} of the guest. +This name will be displayed in the SDL window caption. +The @var{name} will also be used for the VNC server. +Also optionally set the top visible process name in Linux. +ETEXI + +DEF("uuid", HAS_ARG, QEMU_OPTION_uuid, + "-uuid %08x-%04x-%04x-%04x-%012x\n" + " specify machine UUID\n", QEMU_ARCH_ALL) +STEXI +@item -uuid @var{uuid} +@findex -uuid +Set system UUID. +ETEXI + STEXI @end table ETEXI @@ -599,22 +638,6 @@ Network adapter that supports CDC ethernet and RNDIS protocols. @end table ETEXI -DEF("device", HAS_ARG, QEMU_OPTION_device, - "-device driver[,prop[=value][,...]]\n" - " add device (based on driver)\n" - " prop=value,... sets driver properties\n" - " use '-device help' to print all possible drivers\n" - " use '-device driver,help' to print all possible properties\n", - QEMU_ARCH_ALL) -STEXI -@item -device @var{driver}[,@var{prop}[=@var{value}][,...]] -@findex -device -Add device @var{driver}. @var{prop}=@var{value} sets driver -properties. Valid properties depend on the driver. To get help on -possible drivers and properties, use @code{-device help} and -@code{-device @var{driver},help}. -ETEXI - STEXI @end table ETEXI @@ -758,31 +781,6 @@ STEXI Create synthetic file system image ETEXI -DEFHEADING() - -DEF("name", HAS_ARG, QEMU_OPTION_name, - "-name string1[,process=string2]\n" - " set the name of the guest\n" - " string1 sets the window title and string2 the process name (on Linux)\n", - QEMU_ARCH_ALL) -STEXI -@item -name @var{name} -@findex -name -Sets the @var{name} of the guest. -This name will be displayed in the SDL window caption. -The @var{name} will also be used for the VNC server. -Also optionally set the top visible process name in Linux. -ETEXI - -DEF("uuid", HAS_ARG, QEMU_OPTION_uuid, - "-uuid %08x-%04x-%04x-%04x-%012x\n" - " specify machine UUID\n", QEMU_ARCH_ALL) -STEXI -@item -uuid @var{uuid} -@findex -uuid -Set system UUID. -ETEXI - STEXI @end table ETEXI