[Qemu-devel] [PATCH][RESENT] Be consistent in -clock parameter

[Hervé Poussineau]

Hi,

-soundhw, -M, -cpu and -d options use the '?' to display the list of 
possibilities, whereas -clock uses 'help'. This has to be made consistent.

Some debug output is shown when -clock option is specified, which 
displays list of available clocks. In my opinion, interest is very 
limited (as invalid specified clocks are already printed, and list can 
be obtained with -help)

When no available clock has been specified, display the list of valid 
clock names and exit, instead of continuing with the default option 
(once again, to be consistent with other options of Qemu)

Attached patch fixes these 3 issues.

Hervé

Index: vl.c
===================================================================
RCS file: /sources/qemu/qemu/vl.c,v
retrieving revision 1.401
diff -u -r1.401 vl.c
--- vl.c        23 Jan 2008 19:01:12 -0000      1.401
+++ vl.c        31 Jan 2008 16:11:12 -0000
@@ -917,7 +917,7 @@
     char *arg;
     char *name;
 
-    if (!strcmp(opt, "help")) {
+    if (!strcmp(opt, "?")) {
         show_available_alarms();
         exit(0);
     }
@@ -956,13 +956,13 @@
     free(arg);
 
     if (cur) {
-       /* Disable remaining timers */
+        /* Disable remaining timers */
         for (i = cur; i < count; i++)
             alarm_timers[i].name = NULL;
+    } else {
+        show_available_alarms();
+        exit(1);
     }
-
-    /* debug */
-    show_available_alarms();
 }
 
 QEMUClock *rt_clock;
@@ -7662,7 +7662,7 @@
            "-prom-env variable=value  set OpenBIOS nvram variables\n"
 #endif
            "-clock          force the use of the given methods for timer 
alarm.\n"
-           "                To see what timers are available use -clock help\n"
+           "                To see what timers are available use -clock ?\n"
            "-startdate      select initial date of the Qemu clock\n"
            "-translation setting1,... configures code translation\n"
            "                (use -translation ? for a list of settings)\n"