aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-24 16:20:47 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-24 16:20:47 +0100
commitce1d20aac8533357650774c2c240e30de87dc122 (patch)
tree1ca3e10eb8ed839c93a4702250a3b91f74b78f61
parent1d1424ba86580ea68503a9b468ce4c8d511c5c9f (diff)
parentc2a3d7dad2e153668b5a004e4f8336da92c476e1 (diff)
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-24' into staging
nbd patches for 2017-07-24 - Eric Blake: [0/2] Update qemu-nbd version # gpg: Signature made Mon 24 Jul 2017 14:58:23 BST # gpg: using RSA key 0xA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" # gpg: aka "[jpeg image of size 6874]" # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-nbd-2017-07-24: maint: Reorder include directives for qemu-{nbd, io} qemu-nbd: Update version string Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--qemu-img.c3
-rw-r--r--qemu-nbd.c13
2 files changed, 9 insertions, 7 deletions
diff --git a/qemu-img.c b/qemu-img.c
index eb32b93e90..f4d5f0d77d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -22,6 +22,8 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
+#include <getopt.h>
+
#include "qemu-version.h"
#include "qapi/error.h"
#include "qapi/util.h"
@@ -43,7 +45,6 @@
#include "block/qapi.h"
#include "crypto/init.h"
#include "trace/control.h"
-#include <getopt.h>
#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
"\n" QEMU_COPYRIGHT "\n"
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 78d05bea2d..b8666bb575 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -17,6 +17,10 @@
*/
#include "qemu/osdep.h"
+#include <getopt.h>
+#include <libgen.h>
+#include <pthread.h>
+
#include "qapi/error.h"
#include "qemu-common.h"
#include "qemu/cutils.h"
@@ -36,10 +40,7 @@
#include "io/channel-socket.h"
#include "crypto/init.h"
#include "trace/control.h"
-
-#include <getopt.h>
-#include <libgen.h>
-#include <pthread.h>
+#include "qemu-version.h"
#define SOCKET_PATH "/var/lock/qemu-nbd-%s"
#define QEMU_NBD_OPT_CACHE 256
@@ -129,10 +130,10 @@ static void usage(const char *name)
static void version(const char *name)
{
printf(
-"%s version 0.0.1\n"
+"%s " QEMU_VERSION QEMU_PKGVERSION "\n"
"Written by Anthony Liguori.\n"
"\n"
-"Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>.\n"
+QEMU_COPYRIGHT "\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
, name);