|
 |
9ae3a8 |
From 883449501b5d87002bb01c2a060cf650acf45d9a Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: John Snow <jsnow@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 23 Nov 2015 17:38:34 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 15/27] qemu-io: Use the qemu version for -V
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1448300320-7772-16-git-send-email-jsnow@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 68442
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.3 qemu-kvm PATCH v2 15/21] qemu-io: Use the qemu version for -V
|
|
|
9ae3a8 |
Bugzilla: 1272523
|
|
|
9ae3a8 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Always printing 0.0.1 and never updating the version number wasn't very
|
|
|
9ae3a8 |
useful. qemu-io is released with qemu, so using the same version number
|
|
|
9ae3a8 |
makes most sense.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 02da386a2d7a020e80b0aed64769efa9dd42072a)
|
|
|
9ae3a8 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-io.c | 4 +---
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qemu-io.c b/qemu-io.c
|
|
|
9ae3a8 |
index e685808..16b2d8a 100644
|
|
|
9ae3a8 |
--- a/qemu-io.c
|
|
|
9ae3a8 |
+++ b/qemu-io.c
|
|
|
9ae3a8 |
@@ -23,8 +23,6 @@
|
|
|
9ae3a8 |
#include "trace/control.h"
|
|
|
9ae3a8 |
#include "qemu/timer.h"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-#define VERSION "0.0.1"
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
#define CMD_NOFILE_OK 0x01
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
char *progname;
|
|
|
9ae3a8 |
@@ -418,7 +416,7 @@ int main(int argc, char **argv)
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
case 'V':
|
|
|
9ae3a8 |
- printf("%s version %s\n", progname, VERSION);
|
|
|
9ae3a8 |
+ printf("%s version %s\n", progname, QEMU_VERSION);
|
|
|
9ae3a8 |
exit(0);
|
|
|
9ae3a8 |
case 'h':
|
|
|
9ae3a8 |
usage(progname);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|