[PATCH 2/2] make help output be a little more self-consistent

[PATCH 2/2] make help output be a little more self-consistent

[Bruce Rogers]

This is the part which applies to qemu-kvm. 

Signed-off-by: Bruce Rogers <brogers@novell.com> 
---
 qemu-options.hx |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 788d849..fdd5884 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1938,7 +1938,7 @@ DEF("readconfig", HAS_ARG, QEMU_OPTION_readconfig,
     "-readconfig <file>\n")
 DEF("writeconfig", HAS_ARG, QEMU_OPTION_writeconfig,
     "-writeconfig <file>\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")
@@ -1947,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

Re: [PATCH 2/2] make help output be a little more self-consistent

[Avi Kivity]

On 01/07/2010 10:35 PM, Bruce Rogers wrote:
> This is the part which applies to qemu-kvm.
>
>    

Applied, thanks.

> @@ -1938,7 +1938,7 @@ DEF("readconfig", HAS_ARG, QEMU_OPTION_readconfig,
>       "-readconfig<file>\n")
>   DEF("writeconfig", HAS_ARG, QEMU_OPTION_writeconfig,
>       "-writeconfig<file>\n"
> -    "                read/write config file")
> +    "                read/write config file\n")
>
>    

Except for this bit - this belongs upstream.

-- 
error compiling committee.c: too many arguments to function