Commit ce1d20aa authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1d1424ba c2a3d7da

qemu-img.c

+2 −1
Original line number Diff line number Diff line
@@ -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"

qemu-nbd.c

+7 −6
Original line number Diff line number Diff line
@@ -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);