gwj / at91sam9263 · Commits

Commit 3adda04ca24b1b8dee5bcddd972865bb38b3bca8

Authored by aurel32
1 parent 56ec06bb

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
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
... ... @@ -916,7 +916,7 @@ static void configure_alarms(char const *opt)
916 916 char *arg;
917 917 char *name;
918 918  
919   - if (!strcmp(opt, "help")) {
  919 + if (!strcmp(opt, "?")) {
920 920 show_available_alarms();
921 921 exit(0);
922 922 }
... ... @@ -958,10 +958,10 @@ next:
958 958 /* Disable remaining timers */
959 959 for (i = cur; i < count; i++)
960 960 alarm_timers[i].name = NULL;
  961 + } else {
  962 + show_available_alarms();
  963 + exit(1);
961 964 }
962   -
963   - /* debug */
964   - show_available_alarms();
965 965 }
966 966  
967 967 QEMUClock *rt_clock;
... ... @@ -7704,7 +7704,7 @@ static void help(int exitcode)
7704 7704 "-prom-env variable=value set OpenBIOS nvram variables\n"
7705 7705 #endif
7706 7706 "-clock force the use of the given methods for timer alarm.\n"
7707   - " To see what timers are available use -clock help\n"
  7707 + " To see what timers are available use -clock ?\n"
7708 7708 "-startdate select initial date of the clock\n"
7709 7709 "\n"
7710 7710 "During emulation, the following keys are useful:\n"
... ...