aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-03-09 23:43:49 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-03-09 23:43:49 +0000
commit3adda04ca24b1b8dee5bcddd972865bb38b3bca8 (patch)
treeb1c7880b0f3cc6e8074f65ad811bb26a1e3dee4c /vl.c
parent56ec06bb8ea5467f09b0f351e98816a2876111e7 (diff)
downloadqemu-3adda04ca24b1b8dee5bcddd972865bb38b3bca8.zip
qemu-3adda04ca24b1b8dee5bcddd972865bb38b3bca8.tar.gz
qemu-3adda04ca24b1b8dee5bcddd972865bb38b3bca8.tar.bz2
Be consistent in -clock parameter. Display also the list of available
sources if no valid clock name has been specified. (Hervé Poussineau) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4031 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/vl.c b/vl.c
index e2bcb58..baa9891 100644
--- a/vl.c
+++ b/vl.c
@@ -916,7 +916,7 @@ static void configure_alarms(char const *opt)
char *arg;
char *name;
- if (!strcmp(opt, "help")) {
+ if (!strcmp(opt, "?")) {
show_available_alarms();
exit(0);
}
@@ -958,10 +958,10 @@ next:
/* 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;
@@ -7704,7 +7704,7 @@ static void help(int exitcode)
"-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 clock\n"
"\n"
"During emulation, the following keys are useful:\n"