From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LrKFm-00085C-9l
	for qemu-devel@nongnu.org; Tue, 07 Apr 2009 18:58:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LrKFk-00084f-M3
	for qemu-devel@nongnu.org; Tue, 07 Apr 2009 18:58:49 -0400
Received: from [199.232.76.173] (port=46868 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LrKFk-00084a-Iv
	for qemu-devel@nongnu.org; Tue, 07 Apr 2009 18:58:48 -0400
Received: from savannah.gnu.org ([199.232.41.3]:55411 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <paul@nowt.org>) id 1LrKFk-0001bd-6o
	for qemu-devel@nongnu.org; Tue, 07 Apr 2009 18:58:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69) (envelope-from <paul@nowt.org>)
	id 1LrKFi-0004BJ-3R
	for qemu-devel@nongnu.org; Tue, 07 Apr 2009 22:58:46 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <pbrook@savannah.gnu.org>) id 1LrKFh-0004BF-T4
	for qemu-devel@nongnu.org; Tue, 07 Apr 2009 22:58:46 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1LrKFh-0004BF-T4@cvs.savannah.gnu.org>
Date: Tue, 07 Apr 2009 22:58:45 +0000
Subject: [Qemu-devel] [7035] Implement --version.
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

Revision: 7035
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7035
Author:   pbrook
Date:     2009-04-07 22:58:45 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Implement --version.

Signed-off-by: Paul Brook <paul@codesourcery.com>

Modified Paths:
--------------
    trunk/qemu-options.hx
    trunk/vl.c

Modified: trunk/qemu-options.hx
===================================================================
--- trunk/qemu-options.hx	2009-04-07 22:48:36 UTC (rev 7034)
+++ trunk/qemu-options.hx	2009-04-07 22:58:45 UTC (rev 7035)
@@ -17,6 +17,13 @@
 Display help and exit
 ETEXI
 
+DEF("version", 0, QEMU_OPTION_version,
+    "-version        display version information and exit\n")
+STEXI
+@item -version
+Display version information and exit
+ETEXI
+
 DEF("M", HAS_ARG, QEMU_OPTION_M,
     "-M machine      select emulated machine (-M ? for list)\n")
 STEXI

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2009-04-07 22:48:36 UTC (rev 7034)
+++ trunk/vl.c	2009-04-07 22:58:45 UTC (rev 7035)
@@ -3940,10 +3940,15 @@
     return ret;
 }
 
+static void version(void)
+{
+    printf("QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n");
+}
+
 static void help(int exitcode)
 {
-    printf("QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003-2008 Fabrice Bellard\n"
-           "usage: %s [options] [disk_image]\n"
+    version();
+    printf("usage: %s [options] [disk_image]\n"
            "\n"
            "'disk_image' is a raw hard image image for IDE hard disk 0\n"
            "\n"
@@ -4598,6 +4603,10 @@
             case QEMU_OPTION_h:
                 help(0);
                 break;
+            case QEMU_OPTION_version:
+                version();
+                exit(0);
+                break;
             case QEMU_OPTION_m: {
                 uint64_t value;
                 char *ptr;