From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JKc3T-0007eZ-Eh
	for qemu-devel@nongnu.org; Thu, 31 Jan 2008 11:14:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JKc3S-0007dy-G9
	for qemu-devel@nongnu.org; Thu, 31 Jan 2008 11:14:23 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JKc3S-0007dq-1W
	for qemu-devel@nongnu.org; Thu, 31 Jan 2008 11:14:22 -0500
Received: from smtp7-g19.free.fr ([212.27.42.64])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <hpoussin@reactos.org>) id 1JKc3R-0005fU-JQ
	for qemu-devel@nongnu.org; Thu, 31 Jan 2008 11:14:22 -0500
Received: from smtp7-g19.free.fr (localhost [127.0.0.1])
	by smtp7-g19.free.fr (Postfix) with ESMTP id 85D03322874
	for <qemu-devel@nongnu.org>; Thu, 31 Jan 2008 17:14:08 +0100 (CET)
Received: from [127.0.0.1] (rob92-4-82-225-201-66.fbx.proxad.net
	[82.225.201.66])
	by smtp7-g19.free.fr (Postfix) with ESMTP id 1D0863228BD
	for <qemu-devel@nongnu.org>; Thu, 31 Jan 2008 17:14:08 +0100 (CET)
Message-ID: <47A1F3CE.4020107@reactos.org>
Date: Thu, 31 Jan 2008 17:14:06 +0100
From: =?ISO-8859-1?Q?Herv=E9_Poussineau?= <hpoussin@reactos.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------060201050507050003010104"
Subject: [Qemu-devel] [PATCH] Be consistent in -clock parameter
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------060201050507050003010104
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

-soundhw, -M, -cpu, -d, -translation options use the '?' to display the 
list of possibilities, whereas -clock uses 'help'. Change it to be 
consistent.
Display also the list of available sources if no valid clock name has 
been specified.

--------------060201050507050003010104
Content-Type: text/plain;
 name="clock.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="clock.diff"

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"

--------------060201050507050003010104--