The following changes since commit bfec359afba088aaacc7d316f43302f28c6e642a:

Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2017-04-21' into staging (2017-04-21 11:42:03 +0100)

git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request

for you to fetch changes up to 1507631e438930bc07f776f303af127a9cdb4d41:

qemu-iotests: _cleanup_qemu must be called on exit (2017-04-21 08:32:44 -0400)

Block patches for 2.10

----------------------------------------------------------------

Ashish Mittal (2):

block/vxhs.c: Add support for a new block device type called "vxhs"

block/vxhs.c: Add qemu-iotests for new block device type "vxhs"

Jeff Cody (10):

qemu-iotests: exclude vxhs from image creation via protocol

block: add bdrv_set_read_only() helper function

block: do not set BDS read_only if copy_on_read enabled

block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only

block: code movement

block: introduce bdrv_can_set_read_only()

block: use bdrv_can_set_read_only() during reopen

block/rbd - update variable names to more apt names

block/rbd: Add support for reopen()

qemu-iotests: _cleanup_qemu must be called on exit

block.c | 56 +++-

block/Makefile.objs | 2 +

block/bochs.c | 5 +-

block/cloop.c | 5 +-

block/dmg.c | 6 +-

block/rbd.c | 65 +++--

block/trace-events | 17 ++

block/vvfat.c | 19 +-

block/vxhs.c | 575 +++++++++++++++++++++++++++++++++++++++

configure | 39 +++

include/block/block.h | 2 +

qapi/block-core.json | 23 +-

tests/qemu-iotests/017 | 1 +

tests/qemu-iotests/020 | 1 +

tests/qemu-iotests/028 | 1 +

tests/qemu-iotests/029 | 1 +

tests/qemu-iotests/073 | 1 +

tests/qemu-iotests/094 | 11 +-

tests/qemu-iotests/102 | 5 +-

tests/qemu-iotests/109 | 1 +

tests/qemu-iotests/114 | 1 +

tests/qemu-iotests/117 | 1 +

tests/qemu-iotests/130 | 2 +

tests/qemu-iotests/134 | 1 +

tests/qemu-iotests/140 | 1 +

tests/qemu-iotests/141 | 1 +

tests/qemu-iotests/143 | 1 +

tests/qemu-iotests/156 | 2 +

tests/qemu-iotests/158 | 1 +

tests/qemu-iotests/common | 6 +

tests/qemu-iotests/common.config | 13 +

tests/qemu-iotests/common.filter | 1 +

tests/qemu-iotests/common.rc | 19 ++

33 files changed, 844 insertions(+), 42 deletions(-)

create mode 100644 block/vxhs.c

From: Ashish Mittal <ashmit602@gmail.com>

Source code for the qnio library that this code loads can be downloaded from:

https://github.com/VeritasHyperScale/libqnio.git

Sample command line using JSON syntax:

./x86_64-softmmu/qemu-system-x86_64 -name instance-00000008 -S -vnc 0.0.0.0:0

-k en-us -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5

-msg timestamp=on

'json:{"driver":"vxhs","vdisk-id":"c3e9095a-a5ee-4dce-afeb-2a59fb387410",

"server":{"host":"172.172.17.4","port":"9999"}}'

Sample command line using URI syntax:

qemu-img convert -f raw -O raw -n

/var/lib/nova/instances/_base/0c5eacd5ebea5ed914b6a3e7b18f1ce734c386ad

vxhs://192.168.0.1:9999/c6718f6b-0401-441d-a8c3-1f0064d75ee0

Sample command line using TLS credentials (run in secure mode):

./qemu-io --object

tls-creds-x509,id=tls0,dir=/etc/pki/qemu/vxhs,endpoint=client -c 'read

-v 66000 2.5k' 'json:{"server.host": "127.0.0.1", "server.port": "9999",

"vdisk-id": "/test.raw", "driver": "vxhs", "tls-creds":"tls0"}'

Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com>

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Reviewed-by: Jeff Cody <jcody@redhat.com>

Signed-off-by: Jeff Cody <jcody@redhat.com>

Message-id: 1491277689-24949-2-git-send-email-Ashish.Mittal@veritas.com

block/Makefile.objs | 2 +

block/trace-events | 17 ++

block/vxhs.c | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++

configure | 39 ++++

qapi/block-core.json | 23 ++-

5 files changed, 654 insertions(+), 2 deletions(-)

create mode 100644 block/vxhs.c

diff --git a/block/Makefile.objs b/block/Makefile.objs

--- a/block/Makefile.objs

+++ b/block/Makefile.objs

@@ -XXX,XX +XXX,XX @@ block-obj-$(CONFIG_LIBNFS) += nfs.o

block-obj-$(CONFIG_CURL) += curl.o

block-obj-$(CONFIG_RBD) += rbd.o

block-obj-$(CONFIG_GLUSTERFS) += gluster.o

+block-obj-$(CONFIG_VXHS) += vxhs.o

block-obj-$(CONFIG_LIBSSH2) += ssh.o

block-obj-y += accounting.o dirty-bitmap.o

block-obj-y += write-threshold.o

@@ -XXX,XX +XXX,XX @@ rbd.o-cflags := $(RBD_CFLAGS)

rbd.o-libs := $(RBD_LIBS)

gluster.o-cflags := $(GLUSTERFS_CFLAGS)

gluster.o-libs := $(GLUSTERFS_LIBS)

+vxhs.o-libs := $(VXHS_LIBS)

ssh.o-cflags := $(LIBSSH2_CFLAGS)

ssh.o-libs := $(LIBSSH2_LIBS)

block-obj-$(if $(CONFIG_BZIP2),m,n) += dmg-bz2.o

diff --git a/block/trace-events b/block/trace-events

--- a/block/trace-events

+++ b/block/trace-events

@@ -XXX,XX +XXX,XX @@ qed_aio_write_data(void *s, void *acb, int ret, uint64_t offset, size_t len) "s

qed_aio_write_prefill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64

qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64

qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu"

+

+# block/vxhs.c

+vxhs_iio_callback(int error) "ctx is NULL: error %d"

+vxhs_iio_callback_chnfail(int err, int error) "QNIO channel failed, no i/o %d, %d"

+vxhs_iio_callback_unknwn(int opcode, int err) "unexpected opcode %d, errno %d"

+vxhs_aio_rw_invalid(int req) "Invalid I/O request iodir %d"

+vxhs_aio_rw_ioerr(char *guid, int iodir, uint64_t size, uint64_t off, void *acb, int ret, int err) "IO ERROR (vDisk %s) FOR : Read/Write = %d size = %lu offset = %lu ACB = %p. Error = %d, errno = %d"

+vxhs_get_vdisk_stat_err(char *guid, int ret, int err) "vDisk (%s) stat ioctl failed, ret = %d, errno = %d"

+vxhs_get_vdisk_stat(char *vdisk_guid, uint64_t vdisk_size) "vDisk %s stat ioctl returned size %lu"

+vxhs_complete_aio(void *acb, uint64_t ret) "aio failed acb %p ret %ld"

+vxhs_parse_uri_filename(const char *filename) "URI passed via bdrv_parse_filename %s"

+vxhs_open_vdiskid(const char *vdisk_id) "Opening vdisk-id %s"

+vxhs_open_hostinfo(char *of_vsa_addr, int port) "Adding host %s:%d to BDRVVXHSState"

+vxhs_open_iio_open(const char *host) "Failed to connect to storage agent on host %s"

+vxhs_parse_uri_hostinfo(char *host, int port) "Host: IP %s, Port %d"

+vxhs_close(char *vdisk_guid) "Closing vdisk %s"

+vxhs_get_creds(const char *cacert, const char *client_key, const char *client_cert) "cacert %s, client_key %s, client_cert %s"

diff --git a/block/vxhs.c b/block/vxhs.c

+++ b/block/vxhs.c

+ * QEMU Block driver for Veritas HyperScale (VxHS)

+ *

+ * Copyright (c) 2017 Veritas Technologies LLC.

+#include <qnio/qnio_api.h>

+#include <sys/param.h>

+#include "block/block_int.h"

+#include "qapi/qmp/qerror.h"

+#include "qapi/qmp/qdict.h"

+#include "qapi/qmp/qstring.h"

+#include "qemu/uri.h"

+#include "qapi/error.h"

+#include "qemu/uuid.h"

+#include "crypto/tlscredsx509.h"

+

+#define VXHS_OPT_FILENAME "filename"

+#define VXHS_OPT_VDISK_ID "vdisk-id"

+#define VXHS_OPT_SERVER "server"

+#define VXHS_OPT_HOST "host"

+#define VXHS_OPT_PORT "port"

+

+/* Only accessed under QEMU global mutex */

+static uint32_t vxhs_ref;

+

+typedef enum {

+ VDISK_AIO_READ,

+ VDISK_AIO_WRITE,

+} VDISKAIOCmd;

+

+/*

+ * HyperScale AIO callbacks structure

+ */

+typedef struct VXHSAIOCB {

+ BlockAIOCB common;

+ int err;

+} VXHSAIOCB;

+

+typedef struct VXHSvDiskHostsInfo {

+ void *dev_handle; /* Device handle */

+ char *host; /* Host name or IP */

+ int port; /* Host's port number */

+} VXHSvDiskHostsInfo;

+

+/*

+ * Structure per vDisk maintained for state

+ */

+typedef struct BDRVVXHSState {

+ VXHSvDiskHostsInfo vdisk_hostinfo; /* Per host info */

+ char *vdisk_guid;

+ char *tlscredsid; /* tlscredsid */

+} BDRVVXHSState;

+

+static void vxhs_complete_aio_bh(void *opaque)

+{

+ VXHSAIOCB *acb = opaque;

+ BlockCompletionFunc *cb = acb->common.cb;

+ void *cb_opaque = acb->common.opaque;

+ int ret = 0;

+

+ if (acb->err != 0) {

+ trace_vxhs_complete_aio(acb, acb->err);

+ ret = (-EIO);

+ }

+

+ qemu_aio_unref(acb);

+ cb(cb_opaque, ret);

+}

+

+/*

+ * Called from a libqnio thread

+ */

+static void vxhs_iio_callback(void *ctx, uint32_t opcode, uint32_t error)

+{

+ VXHSAIOCB *acb = NULL;

+

+ switch (opcode) {

+ case IRP_READ_REQUEST:

+ case IRP_WRITE_REQUEST:

+

+ /*

+ * ctx is VXHSAIOCB*

+ * ctx is NULL if error is QNIOERROR_CHANNEL_HUP

+ */

+ if (ctx) {

+ acb = ctx;

+ } else {

+ trace_vxhs_iio_callback(error);

+ goto out;

+ }

+

+ if (error) {

+ if (!acb->err) {

+ acb->err = error;

+ }

+ trace_vxhs_iio_callback(error);

+ }

+

+ aio_bh_schedule_oneshot(bdrv_get_aio_context(acb->common.bs),

+ vxhs_complete_aio_bh, acb);

+ break;

+

+ default:

+ if (error == QNIOERROR_HUP) {

+ /*

+ * Channel failed, spontaneous notification,

+ * not in response to I/O

+ */

+ trace_vxhs_iio_callback_chnfail(error, errno);

+ } else {

+ trace_vxhs_iio_callback_unknwn(opcode, error);

+ }

+ break;

+ }

+out:

+ return;

+}

+

+static QemuOptsList runtime_opts = {

+ .name = "vxhs",

+ .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),

+ .desc = {

+ {

+ .name = VXHS_OPT_FILENAME,

+ .type = QEMU_OPT_STRING,

+ .help = "URI to the Veritas HyperScale image",

+ },

+ {

+ .name = VXHS_OPT_VDISK_ID,

+ .type = QEMU_OPT_STRING,

+ .help = "UUID of the VxHS vdisk",

+ },

+ {

+ .name = "tls-creds",

+ .type = QEMU_OPT_STRING,

+ .help = "ID of the TLS/SSL credentials to use",

+ },

+ { /* end of list */ }

+ },

+};

+

+static QemuOptsList runtime_tcp_opts = {

+ .name = "vxhs_tcp",

+ .head = QTAILQ_HEAD_INITIALIZER(runtime_tcp_opts.head),

+ .desc = {

+ {

+ .name = VXHS_OPT_HOST,

+ .type = QEMU_OPT_STRING,

+ .help = "host address (ipv4 addresses)",

+ },

+ {

+ .name = VXHS_OPT_PORT,

+ .type = QEMU_OPT_NUMBER,

+ .help = "port number on which VxHSD is listening (default 9999)",

+ .def_value_str = "9999"

+ },

+ { /* end of list */ }

+ },

+};

+

+/*

+ * Parse incoming URI and populate *options with the host

+ * and device information

+ */

+static int vxhs_parse_uri(const char *filename, QDict *options)

+{

+ URI *uri = NULL;

+ char *port;

+ int ret = 0;

+

+ trace_vxhs_parse_uri_filename(filename);

+ uri = uri_parse(filename);

+ if (!uri || !uri->server || !uri->path) {

+ uri_free(uri);

+ return -EINVAL;

+ }

+

+ qdict_put(options, VXHS_OPT_SERVER".host", qstring_from_str(uri->server));

+

+ if (uri->port) {

+ port = g_strdup_printf("%d", uri->port);

+ qdict_put(options, VXHS_OPT_SERVER".port", qstring_from_str(port));

+ g_free(port);

+ }

+

+ qdict_put(options, "vdisk-id", qstring_from_str(uri->path));

+

+ trace_vxhs_parse_uri_hostinfo(uri->server, uri->port);

+ uri_free(uri);

+

+ return ret;

+}

+

+static void vxhs_parse_filename(const char *filename, QDict *options,

+ Error **errp)

+{

+ if (qdict_haskey(options, "vdisk-id") || qdict_haskey(options, "server")) {

+ error_setg(errp, "vdisk-id/server and a file name may not be specified "

+ "at the same time");

+ if (strstr(filename, "://")) {

+ int ret = vxhs_parse_uri(filename, options);

+ if (ret < 0) {

+ error_setg(errp, "Invalid URI. URI should be of the form "

+ " vxhs://<host_ip>:<port>/<vdisk-id>");

+ }

+ }

+}

+

+static int vxhs_init_and_ref(void)

+{

+ if (vxhs_ref++ == 0) {

+ if (iio_init(QNIO_VERSION, vxhs_iio_callback)) {

+ return -ENODEV;

+ }

+ }

+ return 0;

+}

+

+static void vxhs_unref(void)

+{

+ if (--vxhs_ref == 0) {

+ iio_fini();