[Qemu-devel] [PATCH for-2.10 0/2] Update qemu-nbd version

[Qemu-devel] [PATCH for-2.10 0/2] Update qemu-nbd version

[Eric Blake]

陳培泓 reported that 'qemu-nbd -V' was stuck at 0.0.1; fix that,
along with a nearby style issue noticed in the process.  Not
having a useful version number is a bug in my eyes, so I'm
proposing this series for 2.10.

Eric Blake (2):
  qemu-nbd: Update version string
  maint: Reorder include directives for qemu-{nbd,io}

 qemu-img.c |  3 ++-
 qemu-nbd.c | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

-- 
2.13.3

[Qemu-devel] [PATCH 1/2] qemu-nbd: Update version string

[Eric Blake]

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

[Qemu-devel] [PATCH 2/2] maint: Reorder include directives for qemu-{nbd, io}

[Eric Blake]

HACKING recommends listing system includes right after osdep.h,
and before any other in-project headers.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 qemu-img.c | 3 ++-
 qemu-nbd.c | 8 ++++----
 2 files changed, 6 insertions(+), 5 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 1086934a95..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"
@@ -38,10 +42,6 @@
 #include "trace/control.h"
 #include "qemu-version.h"

-#include <getopt.h>
-#include <libgen.h>
-#include <pthread.h>
-
 #define SOCKET_PATH                "/var/lock/qemu-nbd-%s"
 #define QEMU_NBD_OPT_CACHE         256
 #define QEMU_NBD_OPT_AIO           257
-- 
2.13.3

Re: [Qemu-devel] [PATCH 1/2] qemu-nbd: Update version string

[Daniel P. Berrange]

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 :|

Re: [Qemu-devel] [PATCH for-2.10 0/2] Update qemu-nbd version

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 718 bytes --]

On 07/21/2017 08:50 AM, Eric Blake wrote:
> 陳培泓 reported that 'qemu-nbd -V' was stuck at 0.0.1; fix that,
> along with a nearby style issue noticed in the process.  Not
> having a useful version number is a bug in my eyes, so I'm
> proposing this series for 2.10.
> 
> Eric Blake (2):
>   qemu-nbd: Update version string
>   maint: Reorder include directives for qemu-{nbd,io}

Thanks; queued on my NBD branch:
git://repo.or.cz/qemu/ericb.git nbd

> 
>  qemu-img.c |  3 ++-
>  qemu-nbd.c | 13 +++++++------
>  2 files changed, 9 insertions(+), 7 deletions(-)
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]