From patchwork Wed Jan 6 19:31:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Rogers X-Patchwork-Id: 71411 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o06JpWMs025406 for ; Wed, 6 Jan 2010 19:51:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932369Ab0AFTv3 (ORCPT ); Wed, 6 Jan 2010 14:51:29 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756150Ab0AFTv3 (ORCPT ); Wed, 6 Jan 2010 14:51:29 -0500 Received: from sinclair.provo.novell.com ([137.65.248.137]:38886 "EHLO sinclair.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755992Ab0AFTv2 convert rfc822-to-8bit (ORCPT ); Wed, 6 Jan 2010 14:51:28 -0500 X-Greylist: delayed 1203 seconds by postgrey-1.27 at vger.kernel.org; Wed, 06 Jan 2010 14:51:28 EST Received: from INET-PRV-MTA by sinclair.provo.novell.com with Novell_GroupWise; Wed, 06 Jan 2010 12:31:23 -0700 Message-Id: <4B448298020000480008AA6D@sinclair.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Wed, 06 Jan 2010 12:31:20 -0700 From: "Bruce Rogers" To: Subject: [PATCH] make help output be a little more self-consistent Mime-Version: 1.0 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/qemu-options.hx b/qemu-options.hx index 812d067..fdd5884 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -42,7 +42,7 @@ DEF("smp", HAS_ARG, QEMU_OPTION_smp, "-smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]\n" " set the number of CPUs to 'n' [default=1]\n" " maxcpus= maximum number of total cpus, including\n" - " offline CPUs for hotplug etc.\n" + " offline CPUs for hotplug, etc\n" " cores= number of CPU cores on one socket\n" " threads= number of threads on one CPU core\n" " sockets= number of discrete sockets in the system\n") @@ -406,8 +406,9 @@ ETEXI DEF("device", HAS_ARG, QEMU_OPTION_device, "-device driver[,options] add device\n") DEF("name", HAS_ARG, QEMU_OPTION_name, - "-name string1[,process=string2] set the name of the guest\n" - " string1 sets the window title and string2 the process name (on Linux)\n") + "-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") STEXI @item -name @var{name} Sets the @var{name} of the guest. @@ -484,7 +485,7 @@ ETEXI #ifdef CONFIG_SDL DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, - "-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n") + "-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n") #endif STEXI @item -ctrl-grab @@ -757,12 +758,12 @@ ETEXI #ifdef TARGET_I386 DEF("smbios", HAS_ARG, QEMU_OPTION_smbios, "-smbios file=binary\n" - " Load SMBIOS entry from binary file\n" + " load SMBIOS entry from binary file\n" "-smbios type=0[,vendor=str][,version=str][,date=str][,release=%%d.%%d]\n" - " Specify SMBIOS type 0 fields\n" + " specify SMBIOS type 0 fields\n" "-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str]\n" " [,uuid=uuid][,sku=str][,family=str]\n" - " Specify SMBIOS type 1 fields\n") + " specify SMBIOS type 1 fields\n") #endif STEXI @item -smbios file=@var{binary} @@ -817,13 +818,13 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off]\n" " connect the host TAP network interface to VLAN 'n' and use the\n" " network scripts 'file' (default=%s)\n" - " and 'dfile' (default=%s);\n" - " use '[down]script=no' to disable script execution;\n" + " and 'dfile' (default=%s)\n" + " use '[down]script=no' to disable script execution\n" " use 'fd=h' to connect to an already opened TAP interface\n" - " use 'sndbuf=nbytes' to limit the size of the send buffer; the\n" - " default of 'sndbuf=1048576' can be disabled using 'sndbuf=0'\n" - " use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag; use\n" - " vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition\n" + " use 'sndbuf=nbytes' to limit the size of the send buffer (the\n" + " default of 'sndbuf=1048576' can be disabled using 'sndbuf=0')\n" + " use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag\n" + " use vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition\n" #endif "-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port]\n" " connect the vlan 'n' to another VLAN using a socket connection\n" @@ -838,7 +839,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, #endif "-net dump[,vlan=n][,file=f][,len=n]\n" " dump traffic on vlan 'n' to file 'f' (max n bytes per packet)\n" - "-net none use it alone to have zero network devices; if no -net option\n" + "-net none use it alone to have zero network devices. If no -net option\n" " is provided, the default is '-net nic -net user'\n") DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, "-netdev [" @@ -1590,7 +1591,7 @@ The default device is @code{vc} in graphical mode and @code{stdio} in non graphical mode. ETEXI DEF("qmp", HAS_ARG, QEMU_OPTION_qmp, \ - "-qmp dev like -monitor but opens in 'control' mode.\n") + "-qmp dev like -monitor but opens in 'control' mode\n") DEF("mon", HAS_ARG, QEMU_OPTION_mon, \ "-mon chardev=[name][,mode=readline|control][,default]\n") @@ -1608,7 +1609,7 @@ from a script. ETEXI DEF("singlestep", 0, QEMU_OPTION_singlestep, \ - "-singlestep always run in singlestep mode\n") + "-singlestep always run in singlestep mode\n") STEXI @item -singlestep Run the emulation in single step mode. @@ -1892,13 +1893,13 @@ STEXI ETEXI DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \ - "-nodefaults don't create default devices.\n") + "-nodefaults don't create default devices\n") STEXI ETEXI #ifndef _WIN32 DEF("chroot", HAS_ARG, QEMU_OPTION_chroot, \ - "-chroot dir Chroot to dir just before starting the VM.\n") + "-chroot dir chroot to dir just before starting the VM\n") #endif STEXI @item -chroot @var{dir} @@ -1908,7 +1909,7 @@ ETEXI #ifndef _WIN32 DEF("runas", HAS_ARG, QEMU_OPTION_runas, \ - "-runas user Change to user id user just before starting the VM.\n") + "-runas user change to user id user just before starting the VM\n") #endif STEXI @item -runas @var{user} @@ -1937,7 +1938,7 @@ DEF("readconfig", HAS_ARG, QEMU_OPTION_readconfig, "-readconfig \n") DEF("writeconfig", HAS_ARG, QEMU_OPTION_writeconfig, "-writeconfig \n" - " read/write config file") + " read/write config file\n") DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "-no-kvm disable KVM hardware virtualization\n") @@ -1946,26 +1947,27 @@ DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip, DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit, "-no-kvm-pit disable KVM kernel mode PIT\n") DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection, - "-no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection\n") + "-no-kvm-pit-reinjection\n" + " disable KVM kernel mode PIT interrupt reinjection\n") #if defined(TARGET_I386) || defined(TARGET_X86_64) || defined(TARGET_IA64) || defined(__linux__) DEF("pcidevice", HAS_ARG, QEMU_OPTION_pcidevice, "-pcidevice host=bus:dev.func[,dma=none][,name=string]\n" - " expose a PCI device to the guest OS.\n" + " expose a PCI device to the guest OS\n" " dma=none: don't perform any dma translations (default is to use an iommu)\n" - " 'string' is used in log output.\n") + " 'string' is used in log output\n") #endif DEF("enable-nesting", 0, QEMU_OPTION_enable_nesting, "-enable-nesting enable support for running a VM inside the VM (AMD only)\n") DEF("nvram", HAS_ARG, QEMU_OPTION_nvram, - "-nvram FILE provide ia64 nvram contents\n") + "-nvram FILE provide ia64 nvram contents\n") DEF("tdf", 0, QEMU_OPTION_tdf, - "-tdf enable guest time drift compensation\n") + "-tdf enable guest time drift compensation\n") DEF("kvm-shadow-memory", HAS_ARG, QEMU_OPTION_kvm_shadow_memory, "-kvm-shadow-memory MEGABYTES\n" - " allocate MEGABYTES for kvm mmu shadowing\n") + " allocate MEGABYTES for kvm mmu shadowing\n") DEF("mem-path", HAS_ARG, QEMU_OPTION_mempath, - "-mem-path FILE provide backing storage for guest RAM\n") + "-mem-path FILE provide backing storage for guest RAM\n") #ifdef MAP_POPULATE DEF("mem-prealloc", 0, QEMU_OPTION_mem_prealloc, - "-mem-prealloc preallocate guest memory (use with -mempath)\n") + "-mem-prealloc preallocate guest memory (use with -mempath)\n") #endif