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
This commit is contained in:
		
							parent
							
								
									56ec06bb8e
								
							
						
					
					
						commit
						3adda04ca2
					
				
							
								
								
									
										10
									
								
								vl.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								vl.c
									
									
									
									
									
								
							@ -916,7 +916,7 @@ static void configure_alarms(char const *opt)
 | 
				
			|||||||
    char *arg;
 | 
					    char *arg;
 | 
				
			||||||
    char *name;
 | 
					    char *name;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!strcmp(opt, "help")) {
 | 
					    if (!strcmp(opt, "?")) {
 | 
				
			||||||
        show_available_alarms();
 | 
					        show_available_alarms();
 | 
				
			||||||
        exit(0);
 | 
					        exit(0);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@ -958,10 +958,10 @@ next:
 | 
				
			|||||||
	/* Disable remaining timers */
 | 
						/* Disable remaining timers */
 | 
				
			||||||
        for (i = cur; i < count; i++)
 | 
					        for (i = cur; i < count; i++)
 | 
				
			||||||
            alarm_timers[i].name = NULL;
 | 
					            alarm_timers[i].name = NULL;
 | 
				
			||||||
 | 
					    } else {
 | 
				
			||||||
 | 
					        show_available_alarms();
 | 
				
			||||||
 | 
					        exit(1);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					 | 
				
			||||||
    /* debug */
 | 
					 | 
				
			||||||
    show_available_alarms();
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUClock *rt_clock;
 | 
					QEMUClock *rt_clock;
 | 
				
			||||||
@ -7704,7 +7704,7 @@ static void help(int exitcode)
 | 
				
			|||||||
           "-prom-env variable=value  set OpenBIOS nvram variables\n"
 | 
					           "-prom-env variable=value  set OpenBIOS nvram variables\n"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
           "-clock          force the use of the given methods for timer alarm.\n"
 | 
					           "-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"
 | 
					           "-startdate      select initial date of the clock\n"
 | 
				
			||||||
           "\n"
 | 
					           "\n"
 | 
				
			||||||
           "During emulation, the following keys are useful:\n"
 | 
					           "During emulation, the following keys are useful:\n"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user