From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52453)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <berrange@redhat.com>) id 1dYYWu-0008FR-9t
	for qemu-devel@nongnu.org; Fri, 21 Jul 2017 10:03:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <berrange@redhat.com>) id 1dYYWt-0004GD-6C
	for qemu-devel@nongnu.org; Fri, 21 Jul 2017 10:03:44 -0400
Date: Fri, 21 Jul 2017 15:03:29 +0100
From: "Daniel P. Berrange" <berrange@redhat.com>
Message-ID: <20170721140329.GR17693@redhat.com>
Reply-To: "Daniel P. Berrange" <berrange@redhat.com>
References: <20170721135047.25005-1-eblake@redhat.com>
	<20170721135047.25005-2-eblake@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20170721135047.25005-2-eblake@redhat.com>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 1/2] qemu-nbd: Update version string
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Eric Blake <eblake@redhat.com>
Cc: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, "open list:Network Block Dev..." <qemu-block@nongnu.org>

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.
>=20
> Reported-by: =E9=99=B3=E5=9F=B9=E6=B3=93 <pahome.chen@mirlab.org>
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>  qemu-nbd.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>=20
> 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"
>=20
>  #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 PU=
RPOSE.\n"
>      , name);

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


Regards,
Daniel
--=20
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberran=
ge :|
|: https://libvirt.org         -o-            https://fstop138.berrange.c=
om :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberran=
ge :|