kvm tools: Tune the command-line option

With this patch we can have
	-c --cpus
	-m --mem
	-d --disk
	-k --kernel
	-i --initrd
which is more consistent and easy to remember.

The patch also frees up -s, -g option.

Ingo suggestied
'''
 The debug options should probably be concentrated under a --debug option
 anyway, to allow things like:

  --debug single-step,ioport

 Even if the debug options are kept they should be streamlined along
 the same
 pattern:

 >>         --debug-single-step     Enable single stepping
 >>         --debug-ioport          Enable ioport debugging

 But having a --debug option that recognizes all the debug flags would
 be nicer.

 It would also allow future enhancements to group debug features, like:

   --debug all                # turn on everything and the kitchen sink
   for early hangs
   --debug all,-single-step   # turn on everything except single-step
   debugging
   --debug nonverbose         # turn on all non-noisy debug options we
   have

 Maybe even:

   --debug memcheck

 ... could run kvm under valgrind automatically - that way we can hide
 any secondary tool complexities from the user and turn those tools into
 simple debug options :-)
'''

Let's do this --debug option consolidation later.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c
index 91a194e81b784c4ab7d3a7efd380fd8707c5c3dd..ba8e5ce7f4f19e240c39c389364e3655d1a022e5 100644 (file)
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/kvm-run.c
@@ -101,16 +101,17 @@ static const struct option options[] = {
        OPT_GROUP("Basic options:"),
        OPT_INTEGER('c', "cpus", &nrcpus, "Number of CPUs"),
        OPT_U64('m', "mem", &ram_size, "Virtual machine memory size in MiB."),
-       OPT_CALLBACK('i', "image", NULL, "image", "Disk image", img_name_parser),
+       OPT_CALLBACK('d', "disk", NULL, "image", "Disk image", img_name_parser),
        OPT_STRING('\0', "console", &console, "serial or virtio",
                        "Console to use"),
-       OPT_BOOLEAN('\0', "virtio-rng", &virtio_rng,
+       OPT_BOOLEAN('\0', "rng", &virtio_rng,
                        "Enable virtio Random Number Generator"),
+       OPT_STRING('\0', "kvm-dev", &kvm_dev, "kvm-dev", "KVM device file"),
 
        OPT_GROUP("Kernel options:"),
        OPT_STRING('k', "kernel", &kernel_filename, "kernel",
                        "Kernel to boot in virtual machine"),
-       OPT_STRING('r', "initrd", &initrd_filename, "initrd",
+       OPT_STRING('i', "initrd", &initrd_filename, "initrd",
                        "Initial RAM disk image"),
        OPT_STRING('p', "params", &kernel_cmdline, "params",
                        "Kernel command line arguments"),
@@ -124,14 +125,14 @@ static const struct option options[] = {
                        "Assign this address to the guest side NIC"),
        OPT_STRING('\0', "tapscript", &script, "Script path",
                         "Assign a script to process created tap device"),
+
        OPT_GROUP("Debug options:"),
-       OPT_STRING('d', "kvm-dev", &kvm_dev, "kvm-dev", "KVM device file"),
-       OPT_BOOLEAN('s', "single-step", &single_step,
-                       "Enable single stepping"),
-       OPT_BOOLEAN('g', "ioport-debug", &ioport_debug,
-                       "Enable ioport debugging"),
        OPT_BOOLEAN('\0', "debug", &do_debug_print,
                        "Enable debug messages"),
+       OPT_BOOLEAN('\0', "debug-single-step", &single_step,
+                       "Enable single stepping"),
+       OPT_BOOLEAN('\0', "debug-ioport-debug", &ioport_debug,
+                       "Enable ioport debugging"),
        OPT_END()
 };