qemu-io and qemu-img already mirror the qemu version string,
time to make qemu-nbd do the same.

Reported-by: 陳培泓 <pahome.chen@mirlab.org>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 qemu-nbd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 78d05bea2d..1086934a95 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -36,6 +36,7 @@
 #include "io/channel-socket.h"
 #include "crypto/init.h"
 #include "trace/control.h"
+#include "qemu-version.h"

 #include <getopt.h>
 #include <libgen.h>
@@ -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);
-- 
2.13.3

On Fri, Jul 21, 2017 at 08:50:46AM -0500, Eric Blake wrote:
> qemu-io and qemu-img already mirror the qemu version string,
> time to make qemu-nbd do the same.
> 
> Reported-by: 陳培泓 <pahome.chen@mirlab.org>
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>  qemu-nbd.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/qemu-nbd.c b/qemu-nbd.c
> index 78d05bea2d..1086934a95 100644
> --- a/qemu-nbd.c
> +++ b/qemu-nbd.c
> @@ -36,6 +36,7 @@
>  #include "io/channel-socket.h"
>  #include "crypto/init.h"
>  #include "trace/control.h"
> +#include "qemu-version.h"
> 
>  #include <getopt.h>
>  #include <libgen.h>
> @@ -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"

wow, suprised that bogus version has existed for so long :-)

>  "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);

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|