Series comparison

-[Qemu-devel] [PULL 00/12] Block patches
+[Qemu-devel] [PULL 00/16] Block patches
-The following changes since commit bfec359afba088aaacc7d316f43302f28c6e642a:
+The following changes since commit dd25f97c66a75d1508f1d4c6478ed2c95bec428f:
-  Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2017-04-21' into staging (2017-04-21 11:42:03 +0100)
+  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190913' into staging (2019-09-16 10:15:15 +0100)
-are available in the git repository at:
+are available in the Git repository at:
-  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
+  https://github.com/XanClic/qemu.git tags/pull-block-2019-09-16
-for you to fetch changes up to 1507631e438930bc07f776f303af127a9cdb4d41:
+for you to fetch changes up to 1825cc0783ccf0ec5d9f0b225a99b340bdd4c68f:
-  qemu-iotests: _cleanup_qemu must be called on exit (2017-04-21 08:32:44 -0400)
+  qemu-iotests: Add test for bz #1745922 (2019-09-16 15:37:12 +0200)
 ----------------------------------------------------------------
+Block patches:
-Block patches for 2.10
+- Fix for block jobs when used with I/O threads
 - Fix for a corruption when using qcow2's LUKS encryption mode
 - cURL fix
 - check-block.sh cleanups (for make check)
 - Refactoring
 ----------------------------------------------------------------
+Max Reitz (7):
+  curl: Keep pointer to the CURLState in CURLSocket
+  curl: Keep *socket until the end of curl_sock_cb()
+  curl: Check completion in curl_multi_do()
+  curl: Pass CURLSocket to curl_multi_do()
+  curl: Report only ready sockets
+  curl: Handle success in multi_check_completion
+  curl: Check curl_multi_add_handle()'s return code
-Ashish Mittal (2):
+Maxim Levitsky (3):
-  block/vxhs.c: Add support for a new block device type called "vxhs"
+  block/qcow2: Fix corruption introduced by commit 8ac0f15f335
-  block/vxhs.c: Add qemu-iotests for new block device type "vxhs"
+  block/qcow2: refactor encryption code
   qemu-iotests: Add test for bz #1745922
-Jeff Cody (10):
+Nir Soffer (2):
-  qemu-iotests: exclude vxhs from image creation via protocol
+  block: Use QEMU_IS_ALIGNED
-  block: add bdrv_set_read_only() helper function
+  block: Remove unused masks
   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 +++-
+Sergio Lopez (1):
- block/Makefile.objs              |   2 +
+  blockjob: update nodes head while removing all bdrv
- block/bochs.c                    |   5 +-
- block/cloop.c                    |   5 +-
+Thomas Huth (2):
- block/dmg.c                      |   6 +-
+  tests/qemu-iotests/check: Replace "tests" with "iotests" in final
- block/rbd.c                      |  65 +++--
+    status text
- block/trace-events               |  17 ++
+  tests/Makefile: Do not print the name of the check-block.sh shell
- block/vvfat.c                    |  19 +-
+    script
- block/vxhs.c                     | 575 +++++++++++++++++++++++++++++++++++++++
- configure                        |  39 +++
+Vladimir Sementsov-Ogievskiy (1):
- include/block/block.h            |   2 +
+  tests/qemu-iotests: Fix qemu-io related output in 026.out.nocache
- qapi/block-core.json             |  23 +-
- tests/qemu-iotests/017           |   1 +
+ tests/Makefile.include             |   2 +-
- tests/qemu-iotests/020           |   1 +
+ block/qcow2.h                      |   8 +-
- tests/qemu-iotests/028           |   1 +
+ include/block/block.h              |   2 -
- tests/qemu-iotests/029           |   1 +
+ block/bochs.c                      |   4 +-
- tests/qemu-iotests/073           |   1 +
+ block/cloop.c                      |   4 +-
- tests/qemu-iotests/094           |  11 +-
+ block/curl.c                       | 133 ++++++++++-------------
- tests/qemu-iotests/102           |   5 +-
+ block/dmg.c                        |   4 +-
- tests/qemu-iotests/109           |   1 +
+ block/io.c                         |   8 +-
- tests/qemu-iotests/114           |   1 +
+ block/qcow2-cluster.c              |  40 +++----
- tests/qemu-iotests/117           |   1 +
+ block/qcow2-threads.c              |  63 ++++++++---
- tests/qemu-iotests/130           |   2 +
+ block/qcow2.c                      |   9 +-
- tests/qemu-iotests/134           |   1 +
+ block/vvfat.c                      |   8 +-
- tests/qemu-iotests/140           |   1 +
+ blockjob.c                         |  17 ++-
- tests/qemu-iotests/141           |   1 +
+ migration/block.c                  |   2 +-
- tests/qemu-iotests/143           |   1 +
+ qemu-img.c                         |   2 +-
- tests/qemu-iotests/156           |   2 +
+ tests/qemu-iotests/026.out.nocache | 168 ++++++++++++++---------------
- tests/qemu-iotests/158           |   1 +
+ tests/qemu-iotests/263             |  91 ++++++++++++++++
- tests/qemu-iotests/common        |   6 +
+ tests/qemu-iotests/263.out         |  40 +++++++
- tests/qemu-iotests/common.config |  13 +
+ tests/qemu-iotests/check           |   8 +-
- tests/qemu-iotests/common.filter |   1 +
+ tests/qemu-iotests/group           |   1 +
- tests/qemu-iotests/common.rc     |  19 ++
+files changed, 380 insertions(+), 234 deletions(-)
-files changed, 844 insertions(+), 42 deletions(-)
+ create mode 100755 tests/qemu-iotests/263
- create mode 100644 block/vxhs.c
+ create mode 100644 tests/qemu-iotests/263.out
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 05/12] block: do not set BDS read_only if copy_on_read enabled
+[Qemu-devel] [PULL 01/16] block: Use QEMU_IS_ALIGNED
-A few block drivers will set the BDS read_only flag from their
+From: Nir Soffer <nirsof@gmail.com>
 .bdrv_open() function.  This means the bs->read_only flag could
 be set after we enable copy_on_read, as the BDRV_O_COPY_ON_READ
 flag check occurs prior to the call to bdrv->bdrv_open().
-This adds an error return to bdrv_set_read_only(), and an error will be
+Replace instances of:
 return if we try to set the BDS to read_only while copy_on_read is
 enabled.
-This patch also changes the behavior of vvfat.  Before, vvfat could
+    (n & (BDRV_SECTOR_SIZE - 1)) == 0
 override the drive 'readonly' flag with its own, internal 'rw' flag.
-For instance, this -drive parameter would result in a writable image:
+And:
-"-drive format=vvfat,dir=/tmp/vvfat,rw,if=virtio,readonly=on"
+   (n & ~BDRV_SECTOR_MASK) == 0
-This is not correct.  Now, attempting to use the above -drive parameter
+With:
 will result in an error (i.e., 'rw' is incompatible with 'readonly=on').
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+    QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE)
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Which reveals the intent of the code better, and makes it easier to
 locate the code checking alignment.
 Signed-off-by: Nir Soffer <nsoffer@redhat.com>
 Message-id: 20190827185913.27427-2-nsoffer@redhat.com
 Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 0c5b4c1cc2c651471b131f21376dfd5ea24d2196.1491597120.git.jcody@redhat.com
+Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block.c               | 10 +++++++++-
+ block/bochs.c         | 4 ++--
- block/bochs.c         |  5 ++++-
+ block/cloop.c         | 4 ++--
- block/cloop.c         |  5 ++++-
+ block/dmg.c           | 4 ++--
- block/dmg.c           |  6 +++++-
+ block/io.c            | 8 ++++----
- block/rbd.c           | 11 ++++++++++-
+ block/qcow2-cluster.c | 4 ++--
- block/vvfat.c         | 19 +++++++++++++++----
+ block/qcow2.c         | 4 ++--
- include/block/block.h |  2 +-
+ block/vvfat.c         | 8 ++++----
-files changed, 48 insertions(+), 10 deletions(-)
+ qemu-img.c            | 2 +-
 files changed, 19 insertions(+), 19 deletions(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
-     }
- }
--void bdrv_set_read_only(BlockDriverState *bs, bool read_only)
-+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
- {
-+    /* Do not set read_only if copy_on_read is enabled */
-+    if (bs->copy_on_read && read_only) {
-+        error_setg(errp, "Can't set node '%s' to r/o with copy-on-read enabled",
-+                   bdrv_get_device_or_node_name(bs));
-+        return -EINVAL;
-+    }
-+
-     bs->read_only = read_only;
-+    return 0;
- }
- void bdrv_get_full_backing_filename_from_filename(const char *backed,
 diff --git a/block/bochs.c b/block/bochs.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/bochs.c
 +++ b/block/bochs.c
-@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
+@@ -XXX,XX +XXX,XX @@ bochs_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-         return -EINVAL;
+     QEMUIOVector local_qiov;
-     }
+     int ret;
--    bdrv_set_read_only(bs, true); /* no write support yet */
+-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-+    ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */
+-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
-+    if (ret < 0) {
++    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-+        return ret;
++    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-+    }
+     qemu_iovec_init(&local_qiov, qiov->niov);
-     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
+     qemu_co_mutex_lock(&s->lock);
      if (ret < 0) {
 diff --git a/block/cloop.c b/block/cloop.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/cloop.c
 +++ b/block/cloop.c
-@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
+@@ -XXX,XX +XXX,XX @@ cloop_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-         return -EINVAL;
+     int nb_sectors = bytes >> BDRV_SECTOR_BITS;
-     }
+     int ret, i;
--    bdrv_set_read_only(bs, true);
+-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-+    ret = bdrv_set_read_only(bs, true, errp);
+-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
-+    if (ret < 0) {
++    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-+        return ret;
++    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-+    }
+     qemu_co_mutex_lock(&s->lock);
-     /* read header */
      ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
 diff --git a/block/dmg.c b/block/dmg.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/dmg.c
 +++ b/block/dmg.c
-@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
+@@ -XXX,XX +XXX,XX @@ dmg_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-         return -EINVAL;
+     int nb_sectors = bytes >> BDRV_SECTOR_BITS;
-     }
+     int ret, i;
-+    ret = bdrv_set_read_only(bs, true, errp);
+-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-+    if (ret < 0) {
+-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
-+        return ret;
++    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-+    }
++    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-+
-     block_module_load_one("dmg-bz2");
+     qemu_co_mutex_lock(&s->lock);
--    bdrv_set_read_only(bs, true);
+diff --git a/block/io.c b/block/io.c
      s->n_chunks = 0;
      s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
 diff --git a/block/rbd.c b/block/rbd.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
+--- a/block/io.c
-+++ b/block/rbd.c
++++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_driver_preadv(BlockDriverState *bs,
-         goto failed_shutdown;
+     sector_num = offset >> BDRV_SECTOR_BITS;
-     }
+     nb_sectors = bytes >> BDRV_SECTOR_BITS;
-+    /* rbd_open is always r/w */
+-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-     r = rbd_open(s->io_ctx, s->name, &s->image, s->snap);
+-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
-     if (r < 0) {
++    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-         error_setg_errno(errp, -r, "error reading header from %s", s->name);
++    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-         goto failed_open;
+     assert(bytes <= BDRV_REQUEST_MAX_BYTES);
-     }
+     assert(drv->bdrv_co_readv);
--    bdrv_set_read_only(bs, (s->snap != NULL));
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_driver_pwritev(BlockDriverState *bs,
-+    /* If we are using an rbd snapshot, we must be r/o, otherwise
+     sector_num = offset >> BDRV_SECTOR_BITS;
-+     * leave as-is */
+     nb_sectors = bytes >> BDRV_SECTOR_BITS;
-+    if (s->snap != NULL) {
-+        r = bdrv_set_read_only(bs, true, &local_err);
+-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-+        if (r < 0) {
+-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
-+            error_propagate(errp, local_err);
++    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-+            goto failed_open;
++    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-+        }
+     assert(bytes <= BDRV_REQUEST_MAX_BYTES);
-+    }
+     assert(drv->bdrv_co_writev);
-     qemu_opts_del(opts);
+diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
-     return 0;
+index XXXXXXX..XXXXXXX 100644
 --- a/block/qcow2-cluster.c
 +++ b/block/qcow2-cluster.c
@@ -XXX,XX +XXX,XX @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs,
  {
      if (bytes && bs->encrypted) {
          BDRVQcow2State *s = bs->opaque;
 -        assert((offset_in_cluster & ~BDRV_SECTOR_MASK) == 0);
 -        assert((bytes & ~BDRV_SECTOR_MASK) == 0);
 +        assert(QEMU_IS_ALIGNED(offset_in_cluster, BDRV_SECTOR_SIZE));
 +        assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
          assert(s->crypto);
          if (qcow2_co_encrypt(bs, cluster_offset,
                               src_cluster_offset + offset_in_cluster,
 diff --git a/block/qcow2.c b/block/qcow2.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qcow2.c
 +++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
                      goto fail;
                  }
 -                assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
 -                assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
 +                assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
 +                assert(QEMU_IS_ALIGNED(cur_bytes, BDRV_SECTOR_SIZE));
                  if (qcow2_co_decrypt(bs, cluster_offset, offset,
                                       cluster_data, cur_bytes) < 0) {
                      ret = -EIO;
 diff --git a/block/vvfat.c b/block/vvfat.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/vvfat.c
 +++ b/block/vvfat.c
-@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
+@@ -XXX,XX +XXX,XX @@ vvfat_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
+     int nb_sectors = bytes >> BDRV_SECTOR_BITS;
-     s->current_cluster=0xffffffff;
+     void *buf;
--    /* read only is the default for safety */
+-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
--    bdrv_set_read_only(bs, true);
+-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
-     s->qcow = NULL;
++    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-     s->qcow_filename = NULL;
++    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-     s->fat2 = NULL;
-@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
+     buf = g_try_malloc(bytes);
-     s->sector_count = cyls * heads * secs - (s->first_sectors_number - 1);
+     if (bytes && buf == NULL) {
+@@ -XXX,XX +XXX,XX @@ vvfat_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
-     if (qemu_opt_get_bool(opts, "rw", false)) {
+     int nb_sectors = bytes >> BDRV_SECTOR_BITS;
--        ret = enable_write_target(bs, errp);
+     void *buf;
-+        if (!bdrv_is_read_only(bs)) {
-+            ret = enable_write_target(bs, errp);
+-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-+            if (ret < 0) {
+-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
-+                goto fail;
++    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
-+            }
++    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-+        } else {
-+            ret = -EPERM;
+     buf = g_try_malloc(bytes);
-+            error_setg(errp,
+     if (bytes && buf == NULL) {
-+                       "Unable to set VVFAT to 'rw' when drive is read-only");
+diff --git a/qemu-img.c b/qemu-img.c
 +            goto fail;
 +        }
 +    } else  {
 +        /* read only is the default for safety */
 +        ret = bdrv_set_read_only(bs, true, &local_err);
          if (ret < 0) {
 +            error_propagate(errp, local_err);
              goto fail;
          }
 -        bdrv_set_read_only(bs, false);
      }
      bs->total_sectors = cyls * heads * secs;
 diff --git a/include/block/block.h b/include/block/block.h
 index XXXXXXX..XXXXXXX 100644
---- a/include/block/block.h
+--- a/qemu-img.c
-+++ b/include/block/block.h
++++ b/qemu-img.c
-@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
+@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-                             int64_t sector_num, int nb_sectors, int *pnum);
+             int64_t sval;
- bool bdrv_is_read_only(BlockDriverState *bs);
+             sval = cvtnum(optarg);
--void bdrv_set_read_only(BlockDriverState *bs, bool read_only);
+-            if (sval < 0 || sval & (BDRV_SECTOR_SIZE - 1) ||
-+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
++            if (sval < 0 || !QEMU_IS_ALIGNED(sval, BDRV_SECTOR_SIZE) ||
- bool bdrv_is_sg(BlockDriverState *bs);
+                 sval / BDRV_SECTOR_SIZE > MAX_BUF_SECTORS) {
- bool bdrv_is_inserted(BlockDriverState *bs);
+                 error_report("Invalid buffer size for sparse output specified. "
- int bdrv_media_changed(BlockDriverState *bs);
+                     "Valid sizes are multiples of %llu up to %llu. Select "
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 04/12] block: add bdrv_set_read_only() helper function
+[Qemu-devel] [PULL 02/16] block: Remove unused masks
-We have a helper wrapper for checking for the BDS read_only flag,
+From: Nir Soffer <nirsof@gmail.com>
 add a helper wrapper to set the read_only flag as well.
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Replace confusing usage:
-Signed-off-by: Jeff Cody <jcody@redhat.com>
     ~BDRV_SECTOR_MASK
 With more clear:
     (BDRV_SECTOR_SIZE - 1)
 Remove BDRV_SECTOR_MASK and the unused BDRV_BLOCK_OFFSET_MASK which was
 it's last user.
 Signed-off-by: Nir Soffer <nsoffer@redhat.com>
 Message-id: 20190827185913.27427-3-nsoffer@redhat.com
 Reviewed-by: Juan Quintela <quintela@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 9b18972d05f5fa2ac16c014f0af98d680553048d.1491597120.git.jcody@redhat.com
+Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block.c               | 5 +++++
+ include/block/block.h | 2 --
- block/bochs.c         | 2 +-
+ migration/block.c     | 2 +-
- block/cloop.c         | 2 +-
+files changed, 1 insertion(+), 3 deletions(-)
  block/dmg.c           | 2 +-
  block/rbd.c           | 2 +-
  block/vvfat.c         | 4 ++--
  include/block/block.h | 1 +
 files changed, 12 insertions(+), 6 deletions(-)
-diff --git a/block.c b/block.c
-index XXXXXXX..XXXXXXX 100644
---- a/block.c
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
-     }
- }
-+void bdrv_set_read_only(BlockDriverState *bs, bool read_only)
-+{
-+    bs->read_only = read_only;
-+}
-+
- void bdrv_get_full_backing_filename_from_filename(const char *backed,
-                                                   const char *backing,
-                                                   char *dest, size_t sz,
-diff --git a/block/bochs.c b/block/bochs.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/bochs.c
-+++ b/block/bochs.c
-@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
-         return -EINVAL;
-     }
--    bs->read_only = true; /* no write support yet */
-+    bdrv_set_read_only(bs, true); /* no write support yet */
-     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
-     if (ret < 0) {
-diff --git a/block/cloop.c b/block/cloop.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/cloop.c
-+++ b/block/cloop.c
-@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
-         return -EINVAL;
-     }
--    bs->read_only = true;
-+    bdrv_set_read_only(bs, true);
-     /* read header */
-     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
-diff --git a/block/dmg.c b/block/dmg.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/dmg.c
-+++ b/block/dmg.c
-@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
-     }
-     block_module_load_one("dmg-bz2");
--    bs->read_only = true;
-+    bdrv_set_read_only(bs, true);
-     s->n_chunks = 0;
-     s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
-diff --git a/block/rbd.c b/block/rbd.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
-+++ b/block/rbd.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
-         goto failed_open;
-     }
--    bs->read_only = (s->snap != NULL);
-+    bdrv_set_read_only(bs, (s->snap != NULL));
-     qemu_opts_del(opts);
-     return 0;
-diff --git a/block/vvfat.c b/block/vvfat.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/vvfat.c
-+++ b/block/vvfat.c
-@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
-     s->current_cluster=0xffffffff;
-     /* read only is the default for safety */
--    bs->read_only = true;
-+    bdrv_set_read_only(bs, true);
-     s->qcow = NULL;
-     s->qcow_filename = NULL;
-     s->fat2 = NULL;
-@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
-         if (ret < 0) {
-             goto fail;
-         }
--        bs->read_only = false;
-+        bdrv_set_read_only(bs, false);
-     }
-     bs->total_sectors = cyls * heads * secs;
 diff --git a/include/block/block.h b/include/block/block.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/block/block.h
 +++ b/include/block/block.h
-@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
+@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
-                             int64_t sector_num, int nb_sectors, int *pnum);
+ #define BDRV_SECTOR_BITS   9
- bool bdrv_is_read_only(BlockDriverState *bs);
+ #define BDRV_SECTOR_SIZE   (1ULL << BDRV_SECTOR_BITS)
-+void bdrv_set_read_only(BlockDriverState *bs, bool read_only);
+-#define BDRV_SECTOR_MASK   ~(BDRV_SECTOR_SIZE - 1)
- bool bdrv_is_sg(BlockDriverState *bs);
- bool bdrv_is_inserted(BlockDriverState *bs);
+ #define BDRV_REQUEST_MAX_SECTORS MIN(SIZE_MAX >> BDRV_SECTOR_BITS, \
- int bdrv_media_changed(BlockDriverState *bs);
+                                      INT_MAX >> BDRV_SECTOR_BITS)
@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
  #define BDRV_BLOCK_ALLOCATED    0x10
  #define BDRV_BLOCK_EOF          0x20
  #define BDRV_BLOCK_RECURSE      0x40
 -#define BDRV_BLOCK_OFFSET_MASK  BDRV_SECTOR_MASK
  typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;
 diff --git a/migration/block.c b/migration/block.c
 index XXXXXXX..XXXXXXX 100644
 --- a/migration/block.c
 +++ b/migration/block.c
@@ -XXX,XX +XXX,XX @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
      do {
          addr = qemu_get_be64(f);
 -        flags = addr & ~BDRV_SECTOR_MASK;
 +        flags = addr & (BDRV_SECTOR_SIZE - 1);
          addr >>= BDRV_SECTOR_BITS;
          if (flags & BLK_MIG_FLAG_DEVICE_BLOCK) {
 --
-.9.3
+.21.0

-New patch
+[Qemu-devel] [PULL 03/16] tests/qemu-iotests/check: Replace "tests" with "iotests" in final status text
+From: Thomas Huth <thuth@redhat.com>
+When running "make check -j8" or something similar, the iotests are
+running in parallel with the other tests. So when they are printing
+out "Passed all xx tests" or a similar status message at the end,
+it might not be quite clear that this message belongs to the iotests,
+since the output might be mixed with the other tests. Thus change the
+word "tests" here to "iotests" instead to avoid confusion.
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+Message-id: 20190906113920.11271-1-thuth@redhat.com
+Reviewed-by: John Snow <jsnow@redhat.com>
+Signed-off-by: Max Reitz <mreitz@redhat.com>
+---
+ tests/qemu-iotests/check | 8 ++++----
+file changed, 4 insertions(+), 4 deletions(-)
+diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
+index XXXXXXX..XXXXXXX 100755
+--- a/tests/qemu-iotests/check
++++ b/tests/qemu-iotests/check
+@@ -XXX,XX +XXX,XX @@ END        { if (NR > 0) {
+         if [ ! -z "$n_bad" -a $n_bad != 0 ]
+         then
+             echo "Failures:$bad"
+-            echo "Failed $n_bad of $try tests"
++            echo "Failed $n_bad of $try iotests"
+             echo "Failures:$bad" | fmt >>check.log
+-            echo "Failed $n_bad of $try tests" >>check.log
++            echo "Failed $n_bad of $try iotests" >>check.log
+         else
+-            echo "Passed all $try tests"
+-            echo "Passed all $try tests" >>check.log
++            echo "Passed all $try iotests"
++            echo "Passed all $try iotests" >>check.log
+         fi
+         needwrap=false
+     fi
+--
+.21.0

-New patch
+[Qemu-devel] [PULL 04/16] tests/Makefile: Do not print the name of the check-block.sh shell script
+From: Thomas Huth <thuth@redhat.com>
+The check script is already printing out which iotest is currently
+running, so printing out the name of the check-block.sh shell script
+looks superfluous here.
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+Message-id: 20190906113534.10907-1-thuth@redhat.com
+Acked-by: John Snow <jsnow@redhat.com>
+Reviewed-by: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Max Reitz <mreitz@redhat.com>
+---
+ tests/Makefile.include | 2 +-
+file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/tests/Makefile.include b/tests/Makefile.include
+index XXXXXXX..XXXXXXX 100644
+--- a/tests/Makefile.include
++++ b/tests/Makefile.include
+@@ -XXX,XX +XXX,XX @@ QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu
+ check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \
+         qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
+         $(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS)))
+-    $<
++    @$<
+ .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
+ $(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
+--
+.21.0

-New patch
+[Qemu-devel] [PULL 05/16] tests/qemu-iotests: Fix qemu-io related output in 026.out.nocache
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+qemu-io now prefixes its error and warnings with "qemu-io:".
+b9986b08787019e fixed a lot of iotests output but forget about
+.out.nocache. Fix it too.
+Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
+Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Message-id: 20190816153015.447957-2-vsementsov@virtuozzo.com
+Reviewed-by: John Snow <jsnow@redhat.com>
+Signed-off-by: Max Reitz <mreitz@redhat.com>
+---
+ tests/qemu-iotests/026.out.nocache | 168 ++++++++++++++---------------
+file changed, 84 insertions(+), 84 deletions(-)
+diff --git a/tests/qemu-iotests/026.out.nocache b/tests/qemu-iotests/026.out.nocache
+index XXXXXXX..XXXXXXX 100644
+--- a/tests/qemu-iotests/026.out.nocache
++++ b/tests/qemu-iotests/026.out.nocache
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l1_update; errno: 5; imm: off; once: off; write
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l1_update; errno: 5; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l1_update; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l1_update; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l2_update; errno: 5; imm: off; once: off; write
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ wrote 131072/131072 bytes at offset 0
+KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l2_update; errno: 5; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ wrote 131072/131072 bytes at offset 0
+KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l2_update; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ wrote 131072/131072 bytes at offset 0
+KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l2_update; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ wrote 131072/131072 bytes at offset 0
+KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l2_alloc_write; errno: 5; imm: off; once: off; write
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l2_alloc_write; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: write_aio; errno: 5; imm: off; once: off; write
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: write_aio; errno: 5; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: write_aio; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: write_aio; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_load; errno: 5; imm: off; once: off; write
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_load; errno: 5; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_load; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_load; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_update_part; errno: 5; imm: off; once: off; write
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_update_part; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc; errno: 5; imm: off; once: off; write
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_write; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l1_grow_write_table; errno: 5; imm: off; once: off
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l1_grow_write_table; errno: 28; imm: off; once: off
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l1_grow_activate_table; errno: 5; imm: off; once: off
+-Failed to flush the L2 table cache: Input/output error
+-Failed to flush the refcount block cache: Input/output error
++qemu-io: Failed to flush the L2 table cache: Input/output error
++qemu-io: Failed to flush the refcount block cache: Input/output error
+ write failed: Input/output error
+leaked clusters were found on the image.
+@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
+ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
+ Event: l1_grow_activate_table; errno: 28; imm: off; once: off
+-Failed to flush the L2 table cache: No space left on device
+-Failed to flush the refcount block cache: No space left on device
++qemu-io: Failed to flush the L2 table cache: No space left on device
++qemu-io: Failed to flush the refcount block cache: No space left on device
+ write failed: No space left on device
+leaked clusters were found on the image.
+--
+.21.0

-[Qemu-devel] [PULL 11/12] block/rbd: Add support for reopen()
+[Qemu-devel] [PULL 06/16] curl: Keep pointer to the CURLState in CURLSocket
-This adds support for reopen in rbd, for changing between r/w and r/o.
+A follow-up patch will make curl_multi_do() and curl_multi_read() take a
 CURLSocket instead of the CURLState.  They still need the latter,
 though, so add a pointer to it to the former.
-Note, that this is only a flag change, but we will block a change from
+Cc: qemu-stable@nongnu.org
-r/o to r/w if we are using an RBD internal snapshot.
+Signed-off-by: Max Reitz <mreitz@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Message-id: 20190910124136.10565-2-mreitz@redhat.com
 Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  block/curl.c | 3 +++
 file changed, 3 insertions(+)
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+diff --git a/block/curl.c b/block/curl.c
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Message-id: d4e87539167ec6527d44c97b164eabcccf96e4f3.1491597120.git.jcody@redhat.com
 ---
  block/rbd.c | 21 +++++++++++++++++++++
 file changed, 21 insertions(+)
 diff --git a/block/rbd.c b/block/rbd.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
+--- a/block/curl.c
-+++ b/block/rbd.c
++++ b/block/curl.c
-@@ -XXX,XX +XXX,XX @@ failed_opts:
+@@ -XXX,XX +XXX,XX @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,
-     return r;
+ #define CURL_BLOCK_OPT_TIMEOUT_DEFAULT 5
- }
+ struct BDRVCURLState;
-+
++struct CURLState;
-+/* Since RBD is currently always opened R/W via the API,
-+ * we just need to check if we are using a snapshot or not, in
+ static bool libcurl_initialized;
-+ * order to determine if we will allow it to be R/W */
-+static int qemu_rbd_reopen_prepare(BDRVReopenState *state,
+@@ -XXX,XX +XXX,XX @@ typedef struct CURLAIOCB {
-+                                   BlockReopenQueue *queue, Error **errp)
-+{
+ typedef struct CURLSocket {
-+    BDRVRBDState *s = state->bs->opaque;
+     int fd;
-+    int ret = 0;
++    struct CURLState *state;
-+
+     QLIST_ENTRY(CURLSocket) next;
-+    if (s->snap && state->flags & BDRV_O_RDWR) {
+ } CURLSocket;
-+        error_setg(errp,
-+                   "Cannot change node '%s' to r/w when using RBD snapshot",
+@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
-+                   bdrv_get_device_or_node_name(state->bs));
+     if (!socket) {
-+        ret = -EINVAL;
+         socket = g_new0(CURLSocket, 1);
-+    }
+         socket->fd = fd;
-+
++        socket->state = state;
-+    return ret;
+         QLIST_INSERT_HEAD(&state->sockets, socket, next);
-+}
+     }
-+
+     socket = NULL;
  static void qemu_rbd_close(BlockDriverState *bs)
  {
      BDRVRBDState *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_rbd = {
      .bdrv_parse_filename    = qemu_rbd_parse_filename,
      .bdrv_file_open         = qemu_rbd_open,
      .bdrv_close             = qemu_rbd_close,
 +    .bdrv_reopen_prepare    = qemu_rbd_reopen_prepare,
      .bdrv_create            = qemu_rbd_create,
      .bdrv_has_zero_init     = bdrv_has_zero_init_1,
      .bdrv_get_info          = qemu_rbd_getinfo,
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 10/12] block/rbd - update variable names to more apt names
+[Qemu-devel] [PULL 07/16] curl: Keep *socket until the end of curl_sock_cb()
-Update 'clientname' to be 'user', which tracks better with both
+This does not really change anything, but it makes the code a bit easier
-the QAPI and rados variable naming.
+to follow once we use @socket as the opaque pointer for
 aio_set_fd_handler().
-Update 'name' to be 'image_name', as it indicates the rbd image.
+Cc: qemu-stable@nongnu.org
-Naming it 'image' would have been ideal, but we are using that for
+Signed-off-by: Max Reitz <mreitz@redhat.com>
-the rados_image_t value returned by rbd_open().
+Message-id: 20190910124136.10565-3-mreitz@redhat.com
 Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  block/curl.c | 10 +++++-----
 file changed, 5 insertions(+), 5 deletions(-)
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+diff --git a/block/curl.c b/block/curl.c
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Message-id: b7ec1fb2e1cf36f9b6911631447a5b0422590b7d.1491597120.git.jcody@redhat.com
 ---
  block/rbd.c | 33 +++++++++++++++++----------------
 file changed, 17 insertions(+), 16 deletions(-)
 diff --git a/block/rbd.c b/block/rbd.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
+--- a/block/curl.c
-+++ b/block/rbd.c
++++ b/block/curl.c
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRBDState {
+@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
-     rados_t cluster;
-     rados_ioctx_t io_ctx;
+     QLIST_FOREACH(socket, &state->sockets, next) {
-     rbd_image_t image;
+         if (socket->fd == fd) {
--    char *name;
+-            if (action == CURL_POLL_REMOVE) {
-+    char *image_name;
+-                QLIST_REMOVE(socket, next);
-     char *snap;
+-                g_free(socket);
- } BDRVRBDState;
+-            }
+             break;
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
+         }
      int64_t bytes = 0;
      int64_t objsize;
      int obj_order = 0;
 -    const char *pool, *name, *conf, *clientname, *keypairs;
 +    const char *pool, *image_name, *conf, *user, *keypairs;
      const char *secretid;
      rados_t cluster;
      rados_ioctx_t io_ctx;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
       */
      pool       = qdict_get_try_str(options, "pool");
      conf       = qdict_get_try_str(options, "conf");
 -    clientname = qdict_get_try_str(options, "user");
 -    name       = qdict_get_try_str(options, "image");
 +    user       = qdict_get_try_str(options, "user");
 +    image_name = qdict_get_try_str(options, "image");
      keypairs   = qdict_get_try_str(options, "=keyvalue-pairs");
 -    ret = rados_create(&cluster, clientname);
 +    ret = rados_create(&cluster, user);
      if (ret < 0) {
          error_setg_errno(errp, -ret, "error initializing");
          goto exit;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
          goto shutdown;
      }
+@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
--    ret = rbd_create(io_ctx, name, bytes, &obj_order);
+         socket->state = state;
-+    ret = rbd_create(io_ctx, image_name, bytes, &obj_order);
+         QLIST_INSERT_HEAD(&state->sockets, socket, next);
      if (ret < 0) {
          error_setg_errno(errp, -ret, "error rbd create");
      }
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
+-    socket = NULL;
-                          Error **errp)
- {
+     trace_curl_sock_cb(action, (int)fd);
-     BDRVRBDState *s = bs->opaque;
+     switch (action) {
--    const char *pool, *snap, *conf, *clientname, *name, *keypairs;
+@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
-+    const char *pool, *snap, *conf, *user, *image_name, *keypairs;
+             break;
      const char *secretid;
      QemuOpts *opts;
      Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
      pool           = qemu_opt_get(opts, "pool");
      conf           = qemu_opt_get(opts, "conf");
      snap           = qemu_opt_get(opts, "snapshot");
 -    clientname     = qemu_opt_get(opts, "user");
 -    name           = qemu_opt_get(opts, "image");
 +    user           = qemu_opt_get(opts, "user");
 +    image_name     = qemu_opt_get(opts, "image");
      keypairs       = qemu_opt_get(opts, "=keyvalue-pairs");
 -    if (!pool || !name) {
 +    if (!pool || !image_name) {
          error_setg(errp, "Parameters 'pool' and 'image' are required");
          r = -EINVAL;
          goto failed_opts;
      }
--    r = rados_create(&s->cluster, clientname);
++    if (action == CURL_POLL_REMOVE) {
-+    r = rados_create(&s->cluster, user);
++        QLIST_REMOVE(socket, next);
-     if (r < 0) {
++        g_free(socket);
-         error_setg_errno(errp, -r, "error initializing");
++    }
-         goto failed_opts;
++
-     }
+     return 0;
      s->snap = g_strdup(snap);
 -    s->name = g_strdup(name);
 +    s->image_name = g_strdup(image_name);
      /* try default location when conf=NULL, but ignore failure */
      r = rados_conf_read_file(s->cluster, conf);
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
      }
      /* rbd_open is always r/w */
 -    r = rbd_open(s->io_ctx, s->name, &s->image, s->snap);
 +    r = rbd_open(s->io_ctx, s->image_name, &s->image, s->snap);
      if (r < 0) {
 -        error_setg_errno(errp, -r, "error reading header from %s", s->name);
 +        error_setg_errno(errp, -r, "error reading header from %s",
 +                         s->image_name);
          goto failed_open;
      }
@@ -XXX,XX +XXX,XX @@ failed_open:
  failed_shutdown:
      rados_shutdown(s->cluster);
      g_free(s->snap);
 -    g_free(s->name);
 +    g_free(s->image_name);
  failed_opts:
      qemu_opts_del(opts);
      g_free(mon_host);
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_close(BlockDriverState *bs)
      rbd_close(s->image);
      rados_ioctx_destroy(s->io_ctx);
      g_free(s->snap);
 -    g_free(s->name);
 +    g_free(s->image_name);
      rados_shutdown(s->cluster);
  }
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 09/12] block: use bdrv_can_set_read_only() during reopen
+[Qemu-devel] [PULL 08/16] curl: Check completion in curl_multi_do()
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+While it is more likely that transfers complete after some file
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+descriptor has data ready to read, we probably should not rely on it.
 Better be safe than sorry and call curl_multi_check_completion() in
 curl_multi_do(), too, just like it is done in curl_multi_read().
 With this change, curl_multi_do() and curl_multi_read() are actually the
 same, so drop curl_multi_read() and use curl_multi_do() as the sole FD
 handler.
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 Message-id: 20190910124136.10565-4-mreitz@redhat.com
 Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: 00aed7ffdd7be4b9ed9ce1007d50028a72b34ebe.1491597120.git.jcody@redhat.com
+Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block.c | 14 ++++++++------
+ block/curl.c | 14 ++------------
-file changed, 8 insertions(+), 6 deletions(-)
+file changed, 2 insertions(+), 12 deletions(-)
-diff --git a/block.c b/block.c
+diff --git a/block/curl.c b/block/curl.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/block/curl.c
-+++ b/block.c
++++ b/block/curl.c
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
+@@ -XXX,XX +XXX,XX @@ typedef struct BDRVCURLState {
-     BlockDriver *drv;
-     QemuOpts *opts;
+ static void curl_clean_state(CURLState *s);
-     const char *value;
+ static void curl_multi_do(void *arg);
-+    bool read_only;
+-static void curl_multi_read(void *arg);
-     assert(reopen_state != NULL);
+ #ifdef NEED_CURL_TIMER_CALLBACK
-     assert(reopen_state->bs->drv != NULL);
+ /* Called from curl_multi_do_locked, with s->mutex held.  */
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
+@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
-         qdict_put(reopen_state->options, "driver", qstring_from_str(value));
+     switch (action) {
-     }
+         case CURL_POLL_IN:
+             aio_set_fd_handler(s->aio_context, fd, false,
--    /* if we are to stay read-only, do not allow permission change
+-                               curl_multi_read, NULL, NULL, state);
--     * to r/w */
++                               curl_multi_do, NULL, NULL, state);
--    if (!(reopen_state->bs->open_flags & BDRV_O_ALLOW_RDWR) &&
+             break;
--        reopen_state->flags & BDRV_O_RDWR) {
+         case CURL_POLL_OUT:
--        error_setg(errp, "Node '%s' is read only",
+             aio_set_fd_handler(s->aio_context, fd, false,
--                   bdrv_get_device_or_node_name(reopen_state->bs));
+@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
-+    /* If we are to stay read-only, do not allow permission change
+             break;
-+     * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is
+         case CURL_POLL_INOUT:
-+     * not set, or if the BDS still has copy_on_read enabled */
+             aio_set_fd_handler(s->aio_context, fd, false,
-+    read_only = !(reopen_state->flags & BDRV_O_RDWR);
+-                               curl_multi_read, curl_multi_do, NULL, state);
-+    ret = bdrv_can_set_read_only(reopen_state->bs, read_only, &local_err);
++                               curl_multi_do, curl_multi_do, NULL, state);
-+    if (local_err) {
+             break;
-+        error_propagate(errp, local_err);
+         case CURL_POLL_REMOVE:
-         goto error;
+             aio_set_fd_handler(s->aio_context, fd, false,
-     }
+@@ -XXX,XX +XXX,XX @@ static void curl_multi_do(void *arg)
+ {
      CURLState *s = (CURLState *)arg;
 -    qemu_mutex_lock(&s->s->mutex);
 -    curl_multi_do_locked(s);
 -    qemu_mutex_unlock(&s->s->mutex);
 -}
 -
 -static void curl_multi_read(void *arg)
 -{
 -    CURLState *s = (CURLState *)arg;
 -
      qemu_mutex_lock(&s->s->mutex);
      curl_multi_do_locked(s);
      curl_multi_check_completion(s->s);
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 07/12] block: code movement
+[Qemu-devel] [PULL 09/16] curl: Pass CURLSocket to curl_multi_do()
-Move bdrv_is_read_only() up with its friends.
+curl_multi_do_locked() currently marks all sockets as ready.  That is
 not only inefficient, but in fact unsafe (the loop is).  A follow-up
 patch will change that, but to do so, curl_multi_do_locked() needs to
 know exactly which socket is ready; and that is accomplished by this
 patch here.
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Cc: qemu-stable@nongnu.org
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 Message-id: 20190910124136.10565-5-mreitz@redhat.com
 Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Signed-off-by: Max Reitz <mreitz@redhat.com>
 Message-id: 73b2399459760c32506f9407efb9dddb3a2789de.1491597120.git.jcody@redhat.com
 ---
- block.c | 10 +++++-----
+ block/curl.c | 20 +++++++++++---------
-file changed, 5 insertions(+), 5 deletions(-)
+file changed, 11 insertions(+), 9 deletions(-)
-diff --git a/block.c b/block.c
+diff --git a/block/curl.c b/block/curl.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/block/curl.c
-+++ b/block.c
++++ b/block/curl.c
-@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
+@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
-     }
+     switch (action) {
          case CURL_POLL_IN:
              aio_set_fd_handler(s->aio_context, fd, false,
 -                               curl_multi_do, NULL, NULL, state);
 +                               curl_multi_do, NULL, NULL, socket);
              break;
          case CURL_POLL_OUT:
              aio_set_fd_handler(s->aio_context, fd, false,
 -                               NULL, curl_multi_do, NULL, state);
 +                               NULL, curl_multi_do, NULL, socket);
              break;
          case CURL_POLL_INOUT:
              aio_set_fd_handler(s->aio_context, fd, false,
 -                               curl_multi_do, curl_multi_do, NULL, state);
 +                               curl_multi_do, curl_multi_do, NULL, socket);
              break;
          case CURL_POLL_REMOVE:
              aio_set_fd_handler(s->aio_context, fd, false,
@@ -XXX,XX +XXX,XX @@ static void curl_multi_check_completion(BDRVCURLState *s)
  }
-+bool bdrv_is_read_only(BlockDriverState *bs)
+ /* Called with s->mutex held.  */
-+{
+-static void curl_multi_do_locked(CURLState *s)
-+    return bs->read_only;
++static void curl_multi_do_locked(CURLSocket *ready_socket)
 +}
 +
  int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
  {
-     /* Do not set read_only if copy_on_read is enabled */
+     CURLSocket *socket, *next_socket;
-@@ -XXX,XX +XXX,XX @@ void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr)
++    CURLState *s = ready_socket->state;
-     *nb_sectors_ptr = nb_sectors < 0 ? 0 : nb_sectors;
+     int running;
      int r;
@@ -XXX,XX +XXX,XX @@ static void curl_multi_do_locked(CURLState *s)
  static void curl_multi_do(void *arg)
  {
 -    CURLState *s = (CURLState *)arg;
 +    CURLSocket *socket = arg;
 +    BDRVCURLState *s = socket->state->s;
 -    qemu_mutex_lock(&s->s->mutex);
 -    curl_multi_do_locked(s);
 -    curl_multi_check_completion(s->s);
 -    qemu_mutex_unlock(&s->s->mutex);
 +    qemu_mutex_lock(&s->mutex);
 +    curl_multi_do_locked(socket);
 +    curl_multi_check_completion(s);
 +    qemu_mutex_unlock(&s->mutex);
  }
--bool bdrv_is_read_only(BlockDriverState *bs)
+ static void curl_multi_timeout_do(void *arg)
 -{
 -    return bs->read_only;
 -}
 -
  bool bdrv_is_sg(BlockDriverState *bs)
  {
      return bs->sg;
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 08/12] block: introduce bdrv_can_set_read_only()
+[Qemu-devel] [PULL 10/16] curl: Report only ready sockets
-Introduce check function for setting read_only flags.  Will return < 0 on
+Instead of reporting all sockets to cURL, only report the one that has
-error, with appropriate Error value set.  Does not alter any flags.
+caused curl_multi_do_locked() to be called.  This lets us get rid of the
 QLIST_FOREACH_SAFE() list, which was actually wrong: SAFE foreaches are
 only safe when the current element is removed in each iteration.  If it
 possible for the list to be concurrently modified, we cannot guarantee
 that only the current element will be removed.  Therefore, we must not
 use QLIST_FOREACH_SAFE() here.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Fixes: ff5ca1664af85b24a4180d595ea6873fd3deac57
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Cc: qemu-stable@nongnu.org
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 Message-id: 20190910124136.10565-6-mreitz@redhat.com
 Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: e2bba34ac3bc76a0c42adc390413f358ae0566e8.1491597120.git.jcody@redhat.com
+Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block.c               | 14 +++++++++++++-
+ block/curl.c | 17 ++++++-----------
- include/block/block.h |  1 +
+file changed, 6 insertions(+), 11 deletions(-)
 files changed, 14 insertions(+), 1 deletion(-)
-diff --git a/block.c b/block.c
+diff --git a/block/curl.c b/block/curl.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/block/curl.c
-+++ b/block.c
++++ b/block/curl.c
-@@ -XXX,XX +XXX,XX @@ bool bdrv_is_read_only(BlockDriverState *bs)
+@@ -XXX,XX +XXX,XX @@ static void curl_multi_check_completion(BDRVCURLState *s)
      return bs->read_only;
  }
--int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+ /* Called with s->mutex held.  */
-+int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+-static void curl_multi_do_locked(CURLSocket *ready_socket)
 +static void curl_multi_do_locked(CURLSocket *socket)
  {
-     /* Do not set read_only if copy_on_read is enabled */
+-    CURLSocket *socket, *next_socket;
-     if (bs->copy_on_read && read_only) {
+-    CURLState *s = ready_socket->state;
-@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
++    BDRVCURLState *s = socket->state->s;
-         return -EPERM;
+     int running;
      int r;
 -    if (!s->s->multi) {
 +    if (!s->multi) {
          return;
      }
-+    return 0;
+-    /* Need to use _SAFE because curl_multi_socket_action() may trigger
-+}
+-     * curl_sock_cb() which might modify this list */
-+
+-    QLIST_FOREACH_SAFE(socket, &s->sockets, next, next_socket) {
-+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+-        do {
-+{
+-            r = curl_multi_socket_action(s->s->multi, socket->fd, 0, &running);
-+    int ret = 0;
+-        } while (r == CURLM_CALL_MULTI_PERFORM);
-+
+-    }
-+    ret = bdrv_can_set_read_only(bs, read_only, errp);
++    do {
-+    if (ret < 0) {
++        r = curl_multi_socket_action(s->multi, socket->fd, 0, &running);
-+        return ret;
++    } while (r == CURLM_CALL_MULTI_PERFORM);
 +    }
 +
      bs->read_only = read_only;
      return 0;
  }
-diff --git a/include/block/block.h b/include/block/block.h
-index XXXXXXX..XXXXXXX 100644
+ static void curl_multi_do(void *arg)
 --- a/include/block/block.h
 +++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                              int64_t sector_num, int nb_sectors, int *pnum);
  bool bdrv_is_read_only(BlockDriverState *bs);
 +int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
  int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
  bool bdrv_is_sg(BlockDriverState *bs);
  bool bdrv_is_inserted(BlockDriverState *bs);
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 06/12] block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only
+[Qemu-devel] [PULL 11/16] curl: Handle success in multi_check_completion
-The BDRV_O_ALLOW_RDWR flag allows / prohibits the changing of
+Background: As of cURL 7.59.0, it verifies that several functions are
-the BDS 'read_only' state, but there are a few places where it
+not called from within a callback.  Among these functions is
-is ignored.  In the bdrv_set_read_only() helper, make sure to
+curl_multi_add_handle().
 honor the flag.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+curl_read_cb() is a callback from cURL and not a coroutine.  Waking up
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+acb->co will lead to entering it then and there, which means the current
 request will settle and the caller (if it runs in the same coroutine)
 may then issue the next request.  In such a case, we will enter
 curl_setup_preadv() effectively from within curl_read_cb().
 Calling curl_multi_add_handle() will then fail and the new request will
 not be processed.
 Fix this by not letting curl_read_cb() wake up acb->co.  Instead, leave
 the whole business of settling the AIOCB objects to
 curl_multi_check_completion() (which is called from our timer callback
 and our FD handler, so not from any cURL callbacks).
 Reported-by: Natalie Gavrielov <ngavrilo@redhat.com>
 Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1740193
 Cc: qemu-stable@nongnu.org
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 Message-id: 20190910124136.10565-7-mreitz@redhat.com
 Reviewed-by: John Snow <jsnow@redhat.com>
-Message-id: be2e5fb2d285cbece2b6d06bed54a6f56520d251.1491597120.git.jcody@redhat.com
+Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- block.c | 7 +++++++
+ block/curl.c | 69 ++++++++++++++++++++++------------------------------
-file changed, 7 insertions(+)
+file changed, 29 insertions(+), 40 deletions(-)
-diff --git a/block.c b/block.c
+diff --git a/block/curl.c b/block/curl.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/block/curl.c
-+++ b/block.c
++++ b/block/curl.c
-@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+@@ -XXX,XX +XXX,XX @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
-         return -EINVAL;
+ {
-     }
+     CURLState *s = ((CURLState*)opaque);
+     size_t realsize = size * nmemb;
-+    /* Do not clear read_only if it is prohibited */
+-    int i;
-+    if (!read_only && !(bs->open_flags & BDRV_O_ALLOW_RDWR)) {
-+        error_setg(errp, "Node '%s' is read only",
+     trace_curl_read_cb(realsize);
-+                   bdrv_get_device_or_node_name(bs));
-+        return -EPERM;
+@@ -XXX,XX +XXX,XX @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
-+    }
+     memcpy(s->orig_buf + s->buf_off, ptr, realsize);
      s->buf_off += realsize;
 -    for(i=0; i<CURL_NUM_ACB; i++) {
 -        CURLAIOCB *acb = s->acb[i];
 -
 -        if (!acb)
 -            continue;
 -
 -        if ((s->buf_off >= acb->end)) {
 -            size_t request_length = acb->bytes;
 -
 -            qemu_iovec_from_buf(acb->qiov, 0, s->orig_buf + acb->start,
 -                                acb->end - acb->start);
 -
 -            if (acb->end - acb->start < request_length) {
 -                size_t offset = acb->end - acb->start;
 -                qemu_iovec_memset(acb->qiov, offset, 0,
 -                                  request_length - offset);
 -            }
 -
 -            acb->ret = 0;
 -            s->acb[i] = NULL;
 -            qemu_mutex_unlock(&s->s->mutex);
 -            aio_co_wake(acb->co);
 -            qemu_mutex_lock(&s->s->mutex);
 -        }
 -    }
 -
  read_end:
      /* curl will error out if we do not return this value */
      return size * nmemb;
@@ -XXX,XX +XXX,XX @@ static void curl_multi_check_completion(BDRVCURLState *s)
              break;
          if (msg->msg == CURLMSG_DONE) {
 +            int i;
              CURLState *state = NULL;
 +            bool error = msg->data.result != CURLE_OK;
 +
-     bs->read_only = read_only;
+             curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE,
-     return 0;
+                               (char **)&state);
- }
 -            /* ACBs for successful messages get completed in curl_read_cb */
 -            if (msg->data.result != CURLE_OK) {
 -                int i;
 +            if (error) {
                  static int errcount = 100;
                  /* Don't lose the original error message from curl, since
@@ -XXX,XX +XXX,XX @@ static void curl_multi_check_completion(BDRVCURLState *s)
                          error_report("curl: further errors suppressed");
                      }
                  }
 +            }
 -                for (i = 0; i < CURL_NUM_ACB; i++) {
 -                    CURLAIOCB *acb = state->acb[i];
 +            for (i = 0; i < CURL_NUM_ACB; i++) {
 +                CURLAIOCB *acb = state->acb[i];
 -                    if (acb == NULL) {
 -                        continue;
 -                    }
 +                if (acb == NULL) {
 +                    continue;
 +                }
 +
 +                if (!error) {
 +                    /* Assert that we have read all data */
 +                    assert(state->buf_off >= acb->end);
 +
 +                    qemu_iovec_from_buf(acb->qiov, 0,
 +                                        state->orig_buf + acb->start,
 +                                        acb->end - acb->start);
 -                    acb->ret = -EIO;
 -                    state->acb[i] = NULL;
 -                    qemu_mutex_unlock(&s->mutex);
 -                    aio_co_wake(acb->co);
 -                    qemu_mutex_lock(&s->mutex);
 +                    if (acb->end - acb->start < acb->bytes) {
 +                        size_t offset = acb->end - acb->start;
 +                        qemu_iovec_memset(acb->qiov, offset, 0,
 +                                          acb->bytes - offset);
 +                    }
                  }
 +
 +                acb->ret = error ? -EIO : 0;
 +                state->acb[i] = NULL;
 +                qemu_mutex_unlock(&s->mutex);
 +                aio_co_wake(acb->co);
 +                qemu_mutex_lock(&s->mutex);
              }
              curl_clean_state(state);
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 01/12] block/vxhs.c: Add support for a new block device type called "vxhs"
+[Qemu-devel] [PULL 12/16] curl: Check curl_multi_add_handle()'s return code
-From: Ashish Mittal <ashmit602@gmail.com>
+If we had done that all along, debugging would have been much simpler.
 (Also, I/O errors are better than hangs.)
-Source code for the qnio library that this code loads can be downloaded from:
+Signed-off-by: Max Reitz <mreitz@redhat.com>
-https://github.com/VeritasHyperScale/libqnio.git
+Message-id: 20190910124136.10565-8-mreitz@redhat.com
 Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  block/curl.c | 8 +++++++-
 file changed, 7 insertions(+), 1 deletion(-)
-Sample command line using JSON syntax:
+diff --git a/block/curl.c b/block/curl.c
 ./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 ++-
 files changed, 654 insertions(+), 2 deletions(-)
  create mode 100644 block/vxhs.c
 diff --git a/block/Makefile.objs b/block/Makefile.objs
 index XXXXXXX..XXXXXXX 100644
---- a/block/Makefile.objs
+--- a/block/curl.c
-+++ b/block/Makefile.objs
++++ b/block/curl.c
-@@ -XXX,XX +XXX,XX @@ block-obj-$(CONFIG_LIBNFS) += nfs.o
+@@ -XXX,XX +XXX,XX @@ static void curl_setup_preadv(BlockDriverState *bs, CURLAIOCB *acb)
- block-obj-$(CONFIG_CURL) += curl.o
+     trace_curl_setup_preadv(acb->bytes, start, state->range);
- block-obj-$(CONFIG_RBD) += rbd.o
+     curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);
- block-obj-$(CONFIG_GLUSTERFS) += gluster.o
-+block-obj-$(CONFIG_VXHS) += vxhs.o
+-    curl_multi_add_handle(s->multi, state->curl);
- block-obj-$(CONFIG_LIBSSH2) += ssh.o
++    if (curl_multi_add_handle(s->multi, state->curl) != CURLM_OK) {
- block-obj-y += accounting.o dirty-bitmap.o
++        state->acb[0] = NULL;
- block-obj-y += write-threshold.o
++        acb->ret = -EIO;
@@ -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
 index XXXXXXX..XXXXXXX 100644
 --- 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
++        curl_clean_state(state);
 +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
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/block/vxhs.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * QEMU Block driver for Veritas HyperScale (VxHS)
 + *
 + * Copyright (c) 2017 Veritas Technologies LLC.
 + *
 + * This work is licensed under the terms of the GNU GPL, version 2 or later.
 + * See the COPYING file in the top-level directory.
 + *
 + */
 +
 +#include "qemu/osdep.h"
 +#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 "trace.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");
 +        return;
 +    }
 +
 +    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();
 +    }
 +}
 +
 +static void vxhs_get_tls_creds(const char *id, char **cacert,
 +                               char **key, char **cert, Error **errp)
 +{
 +    Object *obj;
 +    QCryptoTLSCreds *creds;
 +    QCryptoTLSCredsX509 *creds_x509;
 +
 +    obj = object_resolve_path_component(
 +        object_get_objects_root(), id);
 +
 +    if (!obj) {
 +        error_setg(errp, "No TLS credentials with id '%s'",
 +                   id);
 +        return;
 +    }
 +
 +    creds_x509 = (QCryptoTLSCredsX509 *)
 +        object_dynamic_cast(obj, TYPE_QCRYPTO_TLS_CREDS_X509);
 +
 +    if (!creds_x509) {
 +        error_setg(errp, "Object with id '%s' is not TLS credentials",
 +                   id);
 +        return;
 +    }
 +
 +    creds = &creds_x509->parent_obj;
 +
 +    if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
 +        error_setg(errp,
 +                   "Expecting TLS credentials with a client endpoint");
 +        return;
 +    }
 +
 +    /*
 +     * Get the cacert, client_cert and client_key file names.
 +     */
 +    if (!creds->dir) {
 +        error_setg(errp, "TLS object missing 'dir' property value");
 +        return;
 +    }
 +
 +    *cacert = g_strdup_printf("%s/%s", creds->dir,
 +                              QCRYPTO_TLS_CREDS_X509_CA_CERT);
 +    *cert = g_strdup_printf("%s/%s", creds->dir,
 +                            QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
 +    *key = g_strdup_printf("%s/%s", creds->dir,
 +                           QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
 +}
 +
 +static int vxhs_open(BlockDriverState *bs, QDict *options,
 +                     int bdrv_flags, Error **errp)
 +{
 +    BDRVVXHSState *s = bs->opaque;
 +    void *dev_handlep;
 +    QDict *backing_options = NULL;
 +    QemuOpts *opts = NULL;
 +    QemuOpts *tcp_opts = NULL;
 +    char *of_vsa_addr = NULL;
 +    Error *local_err = NULL;
 +    const char *vdisk_id_opt;
 +    const char *server_host_opt;
 +    int ret = 0;
 +    char *cacert = NULL;
 +    char *client_key = NULL;
 +    char *client_cert = NULL;
 +
 +    ret = vxhs_init_and_ref();
 +    if (ret < 0) {
 +        ret = -EINVAL;
 +        goto out;
 +    }
-+
-+    /* Create opts info from runtime_opts and runtime_tcp_opts list */
+     /* Tell curl it needs to kick things off */
-+    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
+     curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
 +    tcp_opts = qemu_opts_create(&runtime_tcp_opts, NULL, 0, &error_abort);
 +
 +    qemu_opts_absorb_qdict(opts, options, &local_err);
 +    if (local_err) {
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    /* vdisk-id is the disk UUID */
 +    vdisk_id_opt = qemu_opt_get(opts, VXHS_OPT_VDISK_ID);
 +    if (!vdisk_id_opt) {
 +        error_setg(&local_err, QERR_MISSING_PARAMETER, VXHS_OPT_VDISK_ID);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    /* vdisk-id may contain a leading '/' */
 +    if (strlen(vdisk_id_opt) > UUID_FMT_LEN + 1) {
 +        error_setg(&local_err, "vdisk-id cannot be more than %d characters",
 +                   UUID_FMT_LEN);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    s->vdisk_guid = g_strdup(vdisk_id_opt);
 +    trace_vxhs_open_vdiskid(vdisk_id_opt);
 +
 +    /* get the 'server.' arguments */
 +    qdict_extract_subqdict(options, &backing_options, VXHS_OPT_SERVER".");
 +
 +    qemu_opts_absorb_qdict(tcp_opts, backing_options, &local_err);
 +    if (local_err != NULL) {
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    server_host_opt = qemu_opt_get(tcp_opts, VXHS_OPT_HOST);
 +    if (!server_host_opt) {
 +        error_setg(&local_err, QERR_MISSING_PARAMETER,
 +                   VXHS_OPT_SERVER"."VXHS_OPT_HOST);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    if (strlen(server_host_opt) > MAXHOSTNAMELEN) {
 +        error_setg(&local_err, "server.host cannot be more than %d characters",
 +                   MAXHOSTNAMELEN);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    /* check if we got tls-creds via the --object argument */
 +    s->tlscredsid = g_strdup(qemu_opt_get(opts, "tls-creds"));
 +    if (s->tlscredsid) {
 +        vxhs_get_tls_creds(s->tlscredsid, &cacert, &client_key,
 +                           &client_cert, &local_err);
 +        if (local_err != NULL) {
 +            ret = -EINVAL;
 +            goto out;
 +        }
 +        trace_vxhs_get_creds(cacert, client_key, client_cert);
 +    }
 +
 +    s->vdisk_hostinfo.host = g_strdup(server_host_opt);
 +    s->vdisk_hostinfo.port = g_ascii_strtoll(qemu_opt_get(tcp_opts,
 +                                                          VXHS_OPT_PORT),
 +                                                          NULL, 0);
 +
 +    trace_vxhs_open_hostinfo(s->vdisk_hostinfo.host,
 +                             s->vdisk_hostinfo.port);
 +
 +    of_vsa_addr = g_strdup_printf("of://%s:%d",
 +                                  s->vdisk_hostinfo.host,
 +                                  s->vdisk_hostinfo.port);
 +
 +    /*
 +     * Open qnio channel to storage agent if not opened before
 +     */
 +    dev_handlep = iio_open(of_vsa_addr, s->vdisk_guid, 0,
 +                           cacert, client_key, client_cert);
 +    if (dev_handlep == NULL) {
 +        trace_vxhs_open_iio_open(of_vsa_addr);
 +        ret = -ENODEV;
 +        goto out;
 +    }
 +    s->vdisk_hostinfo.dev_handle = dev_handlep;
 +
 +out:
 +    g_free(of_vsa_addr);
 +    QDECREF(backing_options);
 +    qemu_opts_del(tcp_opts);
 +    qemu_opts_del(opts);
 +    g_free(cacert);
 +    g_free(client_key);
 +    g_free(client_cert);
 +
 +    if (ret < 0) {
 +        vxhs_unref();
 +        error_propagate(errp, local_err);
 +        g_free(s->vdisk_hostinfo.host);
 +        g_free(s->vdisk_guid);
 +        g_free(s->tlscredsid);
 +        s->vdisk_guid = NULL;
 +    }
 +
 +    return ret;
 +}
 +
 +static const AIOCBInfo vxhs_aiocb_info = {
 +    .aiocb_size = sizeof(VXHSAIOCB)
 +};
 +
 +/*
 + * This allocates QEMU-VXHS callback for each IO
 + * and is passed to QNIO. When QNIO completes the work,
 + * it will be passed back through the callback.
 + */
 +static BlockAIOCB *vxhs_aio_rw(BlockDriverState *bs, int64_t sector_num,
 +                               QEMUIOVector *qiov, int nb_sectors,
 +                               BlockCompletionFunc *cb, void *opaque,
 +                               VDISKAIOCmd iodir)
 +{
 +    VXHSAIOCB *acb = NULL;
 +    BDRVVXHSState *s = bs->opaque;
 +    size_t size;
 +    uint64_t offset;
 +    int iio_flags = 0;
 +    int ret = 0;
 +    void *dev_handle = s->vdisk_hostinfo.dev_handle;
 +
 +    offset = sector_num * BDRV_SECTOR_SIZE;
 +    size = nb_sectors * BDRV_SECTOR_SIZE;
 +    acb = qemu_aio_get(&vxhs_aiocb_info, bs, cb, opaque);
 +
 +    /*
 +     * Initialize VXHSAIOCB.
 +     */
 +    acb->err = 0;
 +
 +    iio_flags = IIO_FLAG_ASYNC;
 +
 +    switch (iodir) {
 +    case VDISK_AIO_WRITE:
 +            ret = iio_writev(dev_handle, acb, qiov->iov, qiov->niov,
 +                             offset, (uint64_t)size, iio_flags);
 +            break;
 +    case VDISK_AIO_READ:
 +            ret = iio_readv(dev_handle, acb, qiov->iov, qiov->niov,
 +                            offset, (uint64_t)size, iio_flags);
 +            break;
 +    default:
 +            trace_vxhs_aio_rw_invalid(iodir);
 +            goto errout;
 +    }
 +
 +    if (ret != 0) {
 +        trace_vxhs_aio_rw_ioerr(s->vdisk_guid, iodir, size, offset,
 +                                acb, ret, errno);
 +        goto errout;
 +    }
 +    return &acb->common;
 +
 +errout:
 +    qemu_aio_unref(acb);
 +    return NULL;
 +}
 +
 +static BlockAIOCB *vxhs_aio_readv(BlockDriverState *bs,
 +                                   int64_t sector_num, QEMUIOVector *qiov,
 +                                   int nb_sectors,
 +                                   BlockCompletionFunc *cb, void *opaque)
 +{
 +    return vxhs_aio_rw(bs, sector_num, qiov, nb_sectors, cb,
 +                       opaque, VDISK_AIO_READ);
 +}
 +
 +static BlockAIOCB *vxhs_aio_writev(BlockDriverState *bs,
 +                                   int64_t sector_num, QEMUIOVector *qiov,
 +                                   int nb_sectors,
 +                                   BlockCompletionFunc *cb, void *opaque)
 +{
 +    return vxhs_aio_rw(bs, sector_num, qiov, nb_sectors,
 +                       cb, opaque, VDISK_AIO_WRITE);
 +}
 +
 +static void vxhs_close(BlockDriverState *bs)
 +{
 +    BDRVVXHSState *s = bs->opaque;
 +
 +    trace_vxhs_close(s->vdisk_guid);
 +
 +    g_free(s->vdisk_guid);
 +    s->vdisk_guid = NULL;
 +
 +    /*
 +     * Close vDisk device
 +     */
 +    if (s->vdisk_hostinfo.dev_handle) {
 +        iio_close(s->vdisk_hostinfo.dev_handle);
 +        s->vdisk_hostinfo.dev_handle = NULL;
 +    }
 +
 +    vxhs_unref();
 +
 +    /*
 +     * Free the dynamically allocated host string etc
 +     */
 +    g_free(s->vdisk_hostinfo.host);
 +    g_free(s->tlscredsid);
 +    s->tlscredsid = NULL;
 +    s->vdisk_hostinfo.host = NULL;
 +    s->vdisk_hostinfo.port = 0;
 +}
 +
 +static int64_t vxhs_get_vdisk_stat(BDRVVXHSState *s)
 +{
 +    int64_t vdisk_size = -1;
 +    int ret = 0;
 +    void *dev_handle = s->vdisk_hostinfo.dev_handle;
 +
 +    ret = iio_ioctl(dev_handle, IOR_VDISK_STAT, &vdisk_size, 0);
 +    if (ret < 0) {
 +        trace_vxhs_get_vdisk_stat_err(s->vdisk_guid, ret, errno);
 +        return -EIO;
 +    }
 +
 +    trace_vxhs_get_vdisk_stat(s->vdisk_guid, vdisk_size);
 +    return vdisk_size;
 +}
 +
 +/*
 + * Returns the size of vDisk in bytes. This is required
 + * by QEMU block upper block layer so that it is visible
 + * to guest.
 + */
 +static int64_t vxhs_getlength(BlockDriverState *bs)
 +{
 +    BDRVVXHSState *s = bs->opaque;
 +    int64_t vdisk_size;
 +
 +    vdisk_size = vxhs_get_vdisk_stat(s);
 +    if (vdisk_size < 0) {
 +        return -EIO;
 +    }
 +
 +    return vdisk_size;
 +}
 +
 +static BlockDriver bdrv_vxhs = {
 +    .format_name                  = "vxhs",
 +    .protocol_name                = "vxhs",
 +    .instance_size                = sizeof(BDRVVXHSState),
 +    .bdrv_file_open               = vxhs_open,
 +    .bdrv_parse_filename          = vxhs_parse_filename,
 +    .bdrv_close                   = vxhs_close,
 +    .bdrv_getlength               = vxhs_getlength,
 +    .bdrv_aio_readv               = vxhs_aio_readv,
 +    .bdrv_aio_writev              = vxhs_aio_writev,
 +};
 +
 +static void bdrv_vxhs_init(void)
 +{
 +    bdrv_register(&bdrv_vxhs);
 +}
 +
 +block_init(bdrv_vxhs_init);
 diff --git a/configure b/configure
 index XXXXXXX..XXXXXXX 100755
 --- a/configure
 +++ b/configure
@@ -XXX,XX +XXX,XX @@ numa=""
  tcmalloc="no"
  jemalloc="no"
  replication="yes"
 +vxhs=""
  supported_cpu="no"
  supported_os="no"
@@ -XXX,XX +XXX,XX @@ for opt do
    ;;
    --enable-replication) replication="yes"
    ;;
 +  --disable-vxhs) vxhs="no"
 +  ;;
 +  --enable-vxhs) vxhs="yes"
 +  ;;
    *)
        echo "ERROR: unknown option $opt"
        echo "Try '$0 --help' for more information"
@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available:
    xfsctl          xfsctl support
    qom-cast-debug  cast debugging support
    tools           build qemu-io, qemu-nbd and qemu-image tools
 +  vxhs            Veritas HyperScale vDisk backend support
  NOTE: The object files are built at the place where configure is launched
  EOF
@@ -XXX,XX +XXX,XX @@ if compile_prog "" "" ; then
  fi
  ##########################################
 +# Veritas HyperScale block driver VxHS
 +# Check if libvxhs is installed
 +
 +if test "$vxhs" != "no" ; then
 +  cat > $TMPC <<EOF
 +#include <stdint.h>
 +#include <qnio/qnio_api.h>
 +
 +void *vxhs_callback;
 +
 +int main(void) {
 +    iio_init(QNIO_VERSION, vxhs_callback);
 +    return 0;
 +}
 +EOF
 +  vxhs_libs="-lvxhs -lssl"
 +  if compile_prog "" "$vxhs_libs" ; then
 +    vxhs=yes
 +  else
 +    if test "$vxhs" = "yes" ; then
 +      feature_not_found "vxhs block device" "Install libvxhs See github"
 +    fi
 +    vxhs=no
 +  fi
 +fi
 +
 +##########################################
  # End of CC checks
  # After here, no more $cc or $ld runs
@@ -XXX,XX +XXX,XX @@ echo "tcmalloc support  $tcmalloc"
  echo "jemalloc support  $jemalloc"
  echo "avx2 optimization $avx2_opt"
  echo "replication support $replication"
 +echo "VxHS block device $vxhs"
  if test "$sdl_too_old" = "yes"; then
  echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -XXX,XX +XXX,XX @@ if test "$pthread_setname_np" = "yes" ; then
    echo "CONFIG_PTHREAD_SETNAME_NP=y" >> $config_host_mak
  fi
 +if test "$vxhs" = "yes" ; then
 +  echo "CONFIG_VXHS=y" >> $config_host_mak
 +  echo "VXHS_LIBS=$vxhs_libs" >> $config_host_mak
 +fi
 +
  if test "$tcg_interpreter" = "yes"; then
    QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"
  elif test "$ARCH" = "sparc64" ; then
 diff --git a/qapi/block-core.json b/qapi/block-core.json
 index XXXXXXX..XXXXXXX 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
  #
  # Drivers that are supported in block device operations.
  #
 +# @vxhs: Since 2.10
 +#
  # Since: 2.9
  ##
  { 'enum': 'BlockdevDriver',
@@ -XXX,XX +XXX,XX @@
              'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
              'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
              'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh',
 -            'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
 +            'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
  ##
  # @BlockdevOptionsFile:
@@ -XXX,XX +XXX,XX @@
    'data': { '*offset': 'int', '*size': 'int' } }
  ##
 +# @BlockdevOptionsVxHS:
 +#
 +# Driver specific block device options for VxHS
 +#
 +# @vdisk-id:    UUID of VxHS volume
 +# @server:      vxhs server IP, port
 +# @tls-creds:   TLS credentials ID
 +#
 +# Since: 2.10
 +##
 +{ 'struct': 'BlockdevOptionsVxHS',
 +  'data': { 'vdisk-id': 'str',
 +            'server': 'InetSocketAddressBase',
 +            '*tls-creds': 'str' } }
 +
 +##
  # @BlockdevOptions:
  #
  # Options for creating a block device.  Many options are available for all
@@ -XXX,XX +XXX,XX @@
        'vhdx':       'BlockdevOptionsGenericFormat',
        'vmdk':       'BlockdevOptionsGenericCOWFormat',
        'vpc':        'BlockdevOptionsGenericFormat',
 -      'vvfat':      'BlockdevOptionsVVFAT'
 +      'vvfat':      'BlockdevOptionsVVFAT',
 +      'vxhs':       'BlockdevOptionsVxHS'
    } }
  ##
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 02/12] block/vxhs.c: Add qemu-iotests for new block device type "vxhs"
+[Qemu-devel] [PULL 13/16] blockjob: update nodes head while removing all bdrv
-From: Ashish Mittal <ashmit602@gmail.com>
+From: Sergio Lopez <slp@redhat.com>
-These changes use a vxhs test server that is a part of the following
+block_job_remove_all_bdrv() iterates through job->nodes, calling
-repository:
+bdrv_root_unref_child() for each entry. The call to the latter may
-https://github.com/VeritasHyperScale/libqnio.git
+reach child_job_[can_]set_aio_ctx(), which will also attempt to
 traverse job->nodes, potentially finding entries that where freed
 on previous iterations.
-Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com>
+To avoid this situation, update job->nodes head on each iteration to
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+ensure that already freed entries are no longer linked to the list.
-Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1746631
-Message-id: 1491277689-24949-3-git-send-email-Ashish.Mittal@veritas.com
+Signed-off-by: Sergio Lopez <slp@redhat.com>
 Cc: qemu-stable@nongnu.org
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 Message-id: 20190911100316.32282-1-mreitz@redhat.com
 Reviewed-by: Sergio Lopez <slp@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- tests/qemu-iotests/common        |  6 ++++++
+ blockjob.c | 17 +++++++++++++----
- tests/qemu-iotests/common.config | 13 +++++++++++++
+file changed, 13 insertions(+), 4 deletions(-)
  tests/qemu-iotests/common.filter |  1 +
  tests/qemu-iotests/common.rc     | 19 +++++++++++++++++++
 files changed, 39 insertions(+)
-diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
+diff --git a/blockjob.c b/blockjob.c
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common
+--- a/blockjob.c
-+++ b/tests/qemu-iotests/common
++++ b/blockjob.c
-@@ -XXX,XX +XXX,XX @@ check options
+@@ -XXX,XX +XXX,XX @@ static const BdrvChildRole child_job = {
-     -ssh                test ssh
-     -nfs                test nfs
+ void block_job_remove_all_bdrv(BlockJob *job)
-     -luks               test luks
+ {
-+    -vxhs               test vxhs
+-    GSList *l;
-     -xdiff              graphical mode diff
+-    for (l = job->nodes; l; l = l->next) {
-     -nocache            use O_DIRECT on backing file
++    /*
-     -misalign           misalign memory allocations
++     * bdrv_root_unref_child() may reach child_job_[can_]set_aio_ctx(),
-@@ -XXX,XX +XXX,XX @@ testlist options
++     * which will also traverse job->nodes, so consume the list one by
-             xpand=false
++     * one to make sure that such a concurrent access does not attempt
-             ;;
++     * to process an already freed BdrvChild.
++     */
-+        -vxhs)
++    while (job->nodes) {
-+            IMGPROTO=vxhs
++        GSList *l = job->nodes;
-+            xpand=false
+         BdrvChild *c = l->data;
 +            ;;
 +
-         -ssh)
++        job->nodes = l->next;
              IMGPROTO=ssh
              xpand=false
 diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/common.config
 +++ b/tests/qemu-iotests/common.config
@@ -XXX,XX +XXX,XX @@ if [ -z "$QEMU_NBD_PROG" ]; then
      export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
  fi
 +if [ -z "$QEMU_VXHS_PROG" ]; then
 +    export QEMU_VXHS_PROG="`set_prog_path qnio_server`"
 +fi
 +
- _qemu_wrapper()
+         bdrv_op_unblock_all(c->bs, job->blocker);
- {
+         bdrv_root_unref_child(c);
-     (
++
-@@ -XXX,XX +XXX,XX @@ _qemu_nbd_wrapper()
++        g_slist_free_1(l);
-     )
+     }
 -    g_slist_free(job->nodes);
 -    job->nodes = NULL;
  }
-+_qemu_vxhs_wrapper()
+ bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs)
 +{
 +    (
 +        echo $BASHPID > "${TEST_DIR}/qemu-vxhs.pid"
 +        exec "$QEMU_VXHS_PROG" $QEMU_VXHS_OPTIONS "$@"
 +    )
 +}
 +
  export QEMU=_qemu_wrapper
  export QEMU_IMG=_qemu_img_wrapper
  export QEMU_IO=_qemu_io_wrapper
  export QEMU_NBD=_qemu_nbd_wrapper
 +export QEMU_VXHS=_qemu_vxhs_wrapper
  QEMU_IMG_EXTRA_ARGS=
  if [ "$IMGOPTSSYNTAX" = "true" ]; then
 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/common.filter
 +++ b/tests/qemu-iotests/common.filter
@@ -XXX,XX +XXX,XX @@ _filter_img_info()
          -e "s#$TEST_DIR#TEST_DIR#g" \
          -e "s#$IMGFMT#IMGFMT#g" \
          -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \
 +        -e 's#json.*vdisk-id.*vxhs"}}#TEST_DIR/t.IMGFMT#' \
          -e "/encrypted: yes/d" \
          -e "/cluster_size: [0-9]\\+/d" \
          -e "/table_size: [0-9]\\+/d" \
 diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
 index XXXXXXX..XXXXXXX 100644
 --- a/tests/qemu-iotests/common.rc
 +++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ else
      elif [ "$IMGPROTO" = "nfs" ]; then
          TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
          TEST_IMG=$TEST_DIR/t.$IMGFMT
 +    elif [ "$IMGPROTO" = "vxhs" ]; then
 +        TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
 +        TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT"
      else
          TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
      fi
@@ -XXX,XX +XXX,XX @@ _make_test_img()
          eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT  $TEST_IMG_FILE >/dev/null &"
          sleep 1 # FIXME: qemu-nbd needs to be listening before we continue
      fi
 +
 +    # Start QNIO server on image directory for vxhs protocol
 +    if [ $IMGPROTO = "vxhs" ]; then
 +        eval "$QEMU_VXHS -d  $TEST_DIR > /dev/null &"
 +        sleep 1 # Wait for server to come up.
 +    fi
  }
  _rm_test_img()
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img()
              fi
              rm -f "$TEST_IMG_FILE"
              ;;
 +        vxhs)
 +            if [ -f "${TEST_DIR}/qemu-vxhs.pid" ]; then
 +                local QEMU_VXHS_PID
 +                read QEMU_VXHS_PID < "${TEST_DIR}/qemu-vxhs.pid"
 +                kill ${QEMU_VXHS_PID} >/dev/null 2>&1
 +                rm -f "${TEST_DIR}/qemu-vxhs.pid"
 +            fi
 +            rm -f "$TEST_IMG_FILE"
 +            ;;
 +
          file)
              _rm_test_img "$TEST_DIR/t.$IMGFMT"
              _rm_test_img "$TEST_DIR/t.$IMGFMT.orig"
 --
-.9.3
+.21.0

-[Qemu-devel] [PULL 03/12] qemu-iotests: exclude vxhs from image creation via protocol
+[Qemu-devel] [PULL 14/16] block/qcow2: Fix corruption introduced by commit 8ac0f15f335
-The protocol VXHS does not support image creation.  Some tests expect
+From: Maxim Levitsky <mlevitsk@redhat.com>
 to be able to create images through the protocol.  Exclude VXHS from
 these tests.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+This fixes subtle corruption introduced by luks threaded encryption
 in commit 8ac0f15f335
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1745922
 The corruption happens when we do a write that
    * writes to two or more unallocated clusters at once
    * doesn't fully cover the first sector
    * doesn't fully cover the last sector
    * uses luks encryption
 In this case, when allocating the new clusters we COW both areas
 prior to the write and after the write, and we encrypt them.
 The above mentioned commit accidentally made it so we encrypt the
 second COW area using the physical cluster offset of the first area.
 The problem is that offset_in_cluster in do_perform_cow_encrypt
 can be larger that the cluster size, thus cluster_offset
 will no longer point to the start of the cluster at which encrypted
 area starts.
 Next patch in this series will refactor the code to avoid all these
 assumptions.
 In the bugreport that was triggered by rebasing a luks image to new,
 zero filled base, which lot of such writes, and causes some files
 with zero areas to contain garbage there instead.
 But as described above it can happen elsewhere as well
 Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Message-id: 20190915203655.21638-2-mlevitsk@redhat.com
 Reviewed-by: Max Reitz <mreitz@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
- tests/qemu-iotests/017 | 1 +
+ block/qcow2-cluster.c | 7 ++++---
- tests/qemu-iotests/020 | 1 +
+file changed, 4 insertions(+), 3 deletions(-)
  tests/qemu-iotests/029 | 1 +
  tests/qemu-iotests/073 | 1 +
  tests/qemu-iotests/114 | 1 +
  tests/qemu-iotests/130 | 1 +
  tests/qemu-iotests/134 | 1 +
  tests/qemu-iotests/156 | 1 +
  tests/qemu-iotests/158 | 1 +
 files changed, 9 insertions(+)
-diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
+diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/017
+--- a/block/qcow2-cluster.c
-+++ b/tests/qemu-iotests/017
++++ b/block/qcow2-cluster.c
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+@@ -XXX,XX +XXX,XX @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs,
- # Any format supporting backing files
+         assert(QEMU_IS_ALIGNED(offset_in_cluster, BDRV_SECTOR_SIZE));
- _supported_fmt qcow qcow2 vmdk qed
+         assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
- _supported_proto generic
+         assert(s->crypto);
-+_unsupported_proto vxhs
+-        if (qcow2_co_encrypt(bs, cluster_offset,
- _supported_os Linux
+-                             src_cluster_offset + offset_in_cluster,
- _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+-                             buffer, bytes) < 0) {
++        if (qcow2_co_encrypt(bs,
-diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
++                start_of_cluster(s, cluster_offset + offset_in_cluster),
-index XXXXXXX..XXXXXXX 100755
++                src_cluster_offset + offset_in_cluster,
---- a/tests/qemu-iotests/020
++                buffer, bytes) < 0) {
-+++ b/tests/qemu-iotests/020
+             return false;
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+         }
- # Any format supporting backing files
+     }
  _supported_fmt qcow qcow2 vmdk qed
  _supported_proto generic
 +_unsupported_proto vxhs
  _supported_os Linux
  _unsupported_imgopts "subformat=monolithicFlat" \
                       "subformat=twoGbMaxExtentFlat" \
 diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/029
 +++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  # Any format supporting intenal snapshots
  _supported_fmt qcow2
  _supported_proto generic
 +_unsupported_proto vxhs
  _supported_os Linux
  # Internal snapshots are (currently) impossible with refcount_bits=1
  _unsupported_imgopts 'refcount_bits=1[^0-9]'
 diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/073
 +++ b/tests/qemu-iotests/073
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
 +_unsupported_proto vxhs
  _supported_os Linux
  CLUSTER_SIZE=64k
 diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/114
 +++ b/tests/qemu-iotests/114
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
 +_unsupported_proto vxhs
  _supported_os Linux
 diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/130
 +++ b/tests/qemu-iotests/130
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
 +_unsupported_proto vxhs
  _supported_os Linux
  qemu_comm_method="monitor"
 diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/134
 +++ b/tests/qemu-iotests/134
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
 +_unsupported_proto vxhs
  _supported_os Linux
 diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/156
 +++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2 qed
  _supported_proto generic
 +_unsupported_proto vxhs
  _supported_os Linux
  # Create source disk
 diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/158
 +++ b/tests/qemu-iotests/158
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
  _supported_fmt qcow2
  _supported_proto generic
 +_unsupported_proto vxhs
  _supported_os Linux
 --
-.9.3
+.21.0

-New patch
+[Qemu-devel] [PULL 15/16] block/qcow2: refactor encryption code
+From: Maxim Levitsky <mlevitsk@redhat.com>
 * Change the qcow2_co_{encrypt|decrypt} to just receive full host and
   guest offsets and use this function directly instead of calling
   do_perform_cow_encrypt (which is removed by that patch).
 * Adjust qcow2_co_encdec to take full host and guest offsets as well.
 * Document the qcow2_co_{encrypt|decrypt} arguments
   to prevent the bug fixed in former commit from hopefully
   happening again.
 Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
 Message-id: 20190915203655.21638-3-mlevitsk@redhat.com
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 [mreitz: Let perform_cow() return the error value returned by
          qcow2_co_encrypt(), as proposed by Vladimir]
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  block/qcow2.h         |  8 +++---
  block/qcow2-cluster.c | 41 +++++++++-------------------
  block/qcow2-threads.c | 63 +++++++++++++++++++++++++++++++++----------
  block/qcow2.c         |  5 ++--
 files changed, 69 insertions(+), 48 deletions(-)
 diff --git a/block/qcow2.h b/block/qcow2.h
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qcow2.h
 +++ b/block/qcow2.h
@@ -XXX,XX +XXX,XX @@ ssize_t coroutine_fn
  qcow2_co_decompress(BlockDriverState *bs, void *dest, size_t dest_size,
                      const void *src, size_t src_size);
  int coroutine_fn
 -qcow2_co_encrypt(BlockDriverState *bs, uint64_t file_cluster_offset,
 -                 uint64_t offset, void *buf, size_t len);
 +qcow2_co_encrypt(BlockDriverState *bs, uint64_t host_offset,
 +                 uint64_t guest_offset, void *buf, size_t len);
  int coroutine_fn
 -qcow2_co_decrypt(BlockDriverState *bs, uint64_t file_cluster_offset,
 -                 uint64_t offset, void *buf, size_t len);
 +qcow2_co_decrypt(BlockDriverState *bs, uint64_t host_offset,
 +                 uint64_t guest_offset, void *buf, size_t len);
  #endif
 diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qcow2-cluster.c
 +++ b/block/qcow2-cluster.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn do_perform_cow_read(BlockDriverState *bs,
      return 0;
  }
 -static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs,
 -                                                uint64_t src_cluster_offset,
 -                                                uint64_t cluster_offset,
 -                                                unsigned offset_in_cluster,
 -                                                uint8_t *buffer,
 -                                                unsigned bytes)
 -{
 -    if (bytes && bs->encrypted) {
 -        BDRVQcow2State *s = bs->opaque;
 -        assert(QEMU_IS_ALIGNED(offset_in_cluster, BDRV_SECTOR_SIZE));
 -        assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
 -        assert(s->crypto);
 -        if (qcow2_co_encrypt(bs,
 -                start_of_cluster(s, cluster_offset + offset_in_cluster),
 -                src_cluster_offset + offset_in_cluster,
 -                buffer, bytes) < 0) {
 -            return false;
 -        }
 -    }
 -    return true;
 -}
 -
  static int coroutine_fn do_perform_cow_write(BlockDriverState *bs,
                                               uint64_t cluster_offset,
                                               unsigned offset_in_cluster,
@@ -XXX,XX +XXX,XX @@ static int perform_cow(BlockDriverState *bs, QCowL2Meta *m)
      /* Encrypt the data if necessary before writing it */
      if (bs->encrypted) {
 -        if (!do_perform_cow_encrypt(bs, m->offset, m->alloc_offset,
 -                                    start->offset, start_buffer,
 -                                    start->nb_bytes) ||
 -            !do_perform_cow_encrypt(bs, m->offset, m->alloc_offset,
 -                                    end->offset, end_buffer, end->nb_bytes)) {
 -            ret = -EIO;
 +        ret = qcow2_co_encrypt(bs,
 +                               m->alloc_offset + start->offset,
 +                               m->offset + start->offset,
 +                               start_buffer, start->nb_bytes);
 +        if (ret < 0) {
 +            goto fail;
 +        }
 +
 +        ret = qcow2_co_encrypt(bs,
 +                               m->alloc_offset + end->offset,
 +                               m->offset + end->offset,
 +                               end_buffer, end->nb_bytes);
 +        if (ret < 0) {
              goto fail;
          }
      }
 diff --git a/block/qcow2-threads.c b/block/qcow2-threads.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qcow2-threads.c
 +++ b/block/qcow2-threads.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_encdec_pool_func(void *opaque)
  }
  static int coroutine_fn
 -qcow2_co_encdec(BlockDriverState *bs, uint64_t file_cluster_offset,
 -                  uint64_t offset, void *buf, size_t len, Qcow2EncDecFunc func)
 +qcow2_co_encdec(BlockDriverState *bs, uint64_t host_offset,
 +                uint64_t guest_offset, void *buf, size_t len,
 +                Qcow2EncDecFunc func)
  {
      BDRVQcow2State *s = bs->opaque;
      Qcow2EncDecData arg = {
          .block = s->crypto,
 -        .offset = s->crypt_physical_offset ?
 -                      file_cluster_offset + offset_into_cluster(s, offset) :
 -                      offset,
 +        .offset = s->crypt_physical_offset ? host_offset : guest_offset,
          .buf = buf,
          .len = len,
          .func = func,
      };
 -    return qcow2_co_process(bs, qcow2_encdec_pool_func, &arg);
 +    assert(QEMU_IS_ALIGNED(guest_offset, BDRV_SECTOR_SIZE));
 +    assert(QEMU_IS_ALIGNED(host_offset, BDRV_SECTOR_SIZE));
 +    assert(QEMU_IS_ALIGNED(len, BDRV_SECTOR_SIZE));
 +    assert(s->crypto);
 +
 +    return len == 0 ? 0 : qcow2_co_process(bs, qcow2_encdec_pool_func, &arg);
  }
 +/*
 + * qcow2_co_encrypt()
 + *
 + * Encrypts one or more contiguous aligned sectors
 + *
 + * @host_offset - underlying storage offset of the first sector of the
 + * data to be encrypted
 + *
 + * @guest_offset - guest (virtual) offset of the first sector of the
 + * data to be encrypted
 + *
 + * @buf - buffer with the data to encrypt, that after encryption
 + *        will be written to the underlying storage device at
 + *        @host_offset
 + *
 + * @len - length of the buffer (must be a BDRV_SECTOR_SIZE multiple)
 + *
 + * Depending on the encryption method, @host_offset and/or @guest_offset
 + * may be used for generating the initialization vector for
 + * encryption.
 + *
 + * Note that while the whole range must be aligned on sectors, it
 + * does not have to be aligned on clusters and can also cross cluster
 + * boundaries
 + */
  int coroutine_fn
 -qcow2_co_encrypt(BlockDriverState *bs, uint64_t file_cluster_offset,
 -                 uint64_t offset, void *buf, size_t len)
 +qcow2_co_encrypt(BlockDriverState *bs, uint64_t host_offset,
 +                 uint64_t guest_offset, void *buf, size_t len)
  {
 -    return qcow2_co_encdec(bs, file_cluster_offset, offset, buf, len,
 -                             qcrypto_block_encrypt);
 +    return qcow2_co_encdec(bs, host_offset, guest_offset, buf, len,
 +                           qcrypto_block_encrypt);
  }
 +/*
 + * qcow2_co_decrypt()
 + *
 + * Decrypts one or more contiguous aligned sectors
 + * Similar to qcow2_co_encrypt
 + */
  int coroutine_fn
 -qcow2_co_decrypt(BlockDriverState *bs, uint64_t file_cluster_offset,
 -                 uint64_t offset, void *buf, size_t len)
 +qcow2_co_decrypt(BlockDriverState *bs, uint64_t host_offset,
 +                 uint64_t guest_offset, void *buf, size_t len)
  {
 -    return qcow2_co_encdec(bs, file_cluster_offset, offset, buf, len,
 -                             qcrypto_block_decrypt);
 +    return qcow2_co_encdec(bs, host_offset, guest_offset, buf, len,
 +                           qcrypto_block_decrypt);
  }
 diff --git a/block/qcow2.c b/block/qcow2.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/qcow2.c
 +++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
                  assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
                  assert(QEMU_IS_ALIGNED(cur_bytes, BDRV_SECTOR_SIZE));
 -                if (qcow2_co_decrypt(bs, cluster_offset, offset,
 +                if (qcow2_co_decrypt(bs, cluster_offset + offset_in_cluster,
 +                                     offset,
                                       cluster_data, cur_bytes) < 0) {
                      ret = -EIO;
                      goto fail;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
              qemu_iovec_to_buf(qiov, qiov_offset + bytes_done,
                                cluster_data, cur_bytes);
 -            if (qcow2_co_encrypt(bs, cluster_offset, offset,
 +            if (qcow2_co_encrypt(bs, cluster_offset + offset_in_cluster, offset,
                                   cluster_data, cur_bytes) < 0) {
                  ret = -EIO;
                  goto out_unlocked;
 --
 .21.0

-[Qemu-devel] [PULL 12/12] qemu-iotests: _cleanup_qemu must be called on exit
+[Qemu-devel] [PULL 16/16] qemu-iotests: Add test for bz #1745922
-For the tests that use the common.qemu functions for running a QEMU
+From: Maxim Levitsky <mlevitsk@redhat.com>
 process, _cleanup_qemu must be called in the exit function.
-If it is not, if the qemu process aborts, then not all of the droppings
+Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
-are cleaned up (e.g. pidfile, fifos).
+Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Message-id: 20190915203655.21638-4-mlevitsk@redhat.com
 Reviewed-by: Max Reitz <mreitz@redhat.com>
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  tests/qemu-iotests/263     | 91 ++++++++++++++++++++++++++++++++++++++
  tests/qemu-iotests/263.out | 40 +++++++++++++++++
  tests/qemu-iotests/group   |  1 +
 files changed, 132 insertions(+)
  create mode 100755 tests/qemu-iotests/263
  create mode 100644 tests/qemu-iotests/263.out
-This updates those tests that did not have a cleanup in qemu-iotests.
+diff --git a/tests/qemu-iotests/263 b/tests/qemu-iotests/263
+new file mode 100755
-(I swapped spaces for tabs in test 102 as well)
+index XXXXXXX..XXXXXXX
+--- /dev/null
-Reported-by: Eric Blake <eblake@redhat.com>
++++ b/tests/qemu-iotests/263
-Reviewed-by: Eric Blake <eblake@redhat.com>
+@@ -XXX,XX +XXX,XX @@
-Signed-off-by: Jeff Cody <jcody@redhat.com>
++#!/usr/bin/env bash
-Message-id: d59c2f6ad6c1da8b9b3c7f357c94a7122ccfc55a.1492544096.git.jcody@redhat.com
++#
----
++# Test encrypted write that crosses cluster boundary of two unallocated clusters
- tests/qemu-iotests/028 |  1 +
++# Based on 188
- tests/qemu-iotests/094 | 11 ++++++++---
++#
- tests/qemu-iotests/102 |  5 +++--
++# Copyright (C) 2019 Red Hat, Inc.
- tests/qemu-iotests/109 |  1 +
++#
- tests/qemu-iotests/117 |  1 +
++# This program is free software; you can redistribute it and/or modify
- tests/qemu-iotests/130 |  1 +
++# it under the terms of the GNU General Public License as published by
- tests/qemu-iotests/140 |  1 +
++# the Free Software Foundation; either version 2 of the License, or
- tests/qemu-iotests/141 |  1 +
++# (at your option) any later version.
- tests/qemu-iotests/143 |  1 +
++#
- tests/qemu-iotests/156 |  1 +
++# This program is distributed in the hope that it will be useful,
-files changed, 19 insertions(+), 5 deletions(-)
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
++# GNU General Public License for more details.
-index XXXXXXX..XXXXXXX 100755
++#
---- a/tests/qemu-iotests/028
++# You should have received a copy of the GNU General Public License
-+++ b/tests/qemu-iotests/028
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
++#
++
- _cleanup()
++# creator
- {
++owner=mlevitsk@redhat.com
-+    _cleanup_qemu
++
-     rm -f "${TEST_IMG}.copy"
++seq=`basename $0`
-     _cleanup_test_img
++echo "QA output created by $seq"
- }
++
-diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
++status=1    # failure is the default!
-index XXXXXXX..XXXXXXX 100755
++
 --- a/tests/qemu-iotests/094
 +++ b/tests/qemu-iotests/094
@@ -XXX,XX +XXX,XX @@ echo "QA output created by $seq"
  here="$PWD"
  status=1    # failure is the default!
 -trap "exit \$status" 0 1 2 3 15
 +_cleanup()
 +{
-+    _cleanup_qemu
++    _cleanup_test_img
-+    _cleanup_test_img
++}
-+    rm -f "$TEST_DIR/source.$IMGFMT"
++trap "_cleanup; exit \$status" 0 1 2 3 15
 +
 +# get standard environment, filters and checks
 +. ./common.rc
 +. ./common.filter
 +
 +_supported_fmt qcow2
 +_supported_proto generic
 +_supported_os Linux
 +
 +
 +size=1M
 +
 +SECRET="secret,id=sec0,data=astrochicken"
 +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT
 +
 +
 +_run_test()
 +{
 +    echo "== reading the whole image =="
 +    $QEMU_IO --object $SECRET -c "read -P 0 0 $size" --image-opts "$1" | _filter_qemu_io | _filter_testdir
 +
 +    echo
 +    echo "== write two 512 byte sectors on a cluster boundary =="
 +    $QEMU_IO --object $SECRET -c "write -P 0xAA 0xFE00 0x400" --image-opts "$1" | _filter_qemu_io | _filter_testdir
 +
 +    echo
 +    echo "== verify that the rest of the image is not changed =="
 +    $QEMU_IO --object $SECRET -c "read -P 0x00 0x00000 0xFE00" --image-opts "$1" | _filter_qemu_io | _filter_testdir
 +    $QEMU_IO --object $SECRET -c "read -P 0xAA 0x0FE00 0x400" --image-opts "$1" | _filter_qemu_io | _filter_testdir
 +    $QEMU_IO --object $SECRET -c "read -P 0x00 0x10200 0xEFE00" --image-opts "$1" | _filter_qemu_io | _filter_testdir
 +
 +}
 +
-+trap "_cleanup; exit \$status" 0 1 2 3 15
++
++echo
- # get standard environment, filters and checks
++echo "testing LUKS qcow2 encryption"
- . ./common.rc
++echo
-@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \
++
++_make_test_img --object $SECRET -o "encrypt.format=luks,encrypt.key-secret=sec0,encrypt.iter-time=10,cluster_size=64K" $size
- wait=1 _cleanup_qemu
++_run_test "driver=$IMGFMT,encrypt.key-secret=sec0,file.filename=$TEST_IMG"
++_cleanup_test_img
--_cleanup_test_img
++
--rm -f "$TEST_DIR/source.$IMGFMT"
++echo
++echo "testing legacy AES qcow2 encryption"
- # success, all done
++echo
- echo '*** done'
++
-diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
++
-index XXXXXXX..XXXXXXX 100755
++_make_test_img --object $SECRET -o "encrypt.format=aes,encrypt.key-secret=sec0,cluster_size=64K" $size
---- a/tests/qemu-iotests/102
++_run_test "driver=$IMGFMT,encrypt.key-secret=sec0,file.filename=$TEST_IMG"
-+++ b/tests/qemu-iotests/102
++_cleanup_test_img
-@@ -XXX,XX +XXX,XX @@ seq=$(basename $0)
++
- echo "QA output created by $seq"
++
++
- here=$PWD
++# success, all done
--status=1    # failure is the default!
++echo "*** done"
-+status=1    # failure is the default!
++rm -f $seq.full
++status=0
- _cleanup()
+diff --git a/tests/qemu-iotests/263.out b/tests/qemu-iotests/263.out
- {
+new file mode 100644
--    _cleanup_test_img
+index XXXXXXX..XXXXXXX
-+    _cleanup_qemu
+--- /dev/null
-+    _cleanup_test_img
++++ b/tests/qemu-iotests/263.out
- }
+@@ -XXX,XX +XXX,XX @@
- trap "_cleanup; exit \$status" 0 1 2 3 15
++QA output created by 263
++
-diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
++testing LUKS qcow2 encryption
-index XXXXXXX..XXXXXXX 100755
++
---- a/tests/qemu-iotests/109
++Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
-+++ b/tests/qemu-iotests/109
++== reading the whole image ==
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
++read 1048576/1048576 bytes at offset 0
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- _cleanup()
++
- {
++== write two 512 byte sectors on a cluster boundary ==
-+    _cleanup_qemu
++wrote 1024/1024 bytes at offset 65024
-     rm -f $TEST_IMG.src
++1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-     _cleanup_test_img
++
- }
++== verify that the rest of the image is not changed ==
-diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
++read 65024/65024 bytes at offset 0
-index XXXXXXX..XXXXXXX 100755
++63.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
---- a/tests/qemu-iotests/117
++read 1024/1024 bytes at offset 65024
-+++ b/tests/qemu-iotests/117
++1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
++read 982528/982528 bytes at offset 66048
++959.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- _cleanup()
++
- {
++testing legacy AES qcow2 encryption
-+    _cleanup_qemu
++
-     _cleanup_test_img
++Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=aes encrypt.key-secret=sec0
- }
++== reading the whole image ==
- trap "_cleanup; exit \$status" 0 1 2 3 15
++read 1048576/1048576 bytes at offset 0
-diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
++1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-index XXXXXXX..XXXXXXX 100755
++
---- a/tests/qemu-iotests/130
++== write two 512 byte sectors on a cluster boundary ==
-+++ b/tests/qemu-iotests/130
++wrote 1024/1024 bytes at offset 65024
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
++1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
++
- _cleanup()
++== verify that the rest of the image is not changed ==
- {
++read 65024/65024 bytes at offset 0
-+    _cleanup_qemu
++63.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-     _cleanup_test_img
++read 1024/1024 bytes at offset 65024
- }
++1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
- trap "_cleanup; exit \$status" 0 1 2 3 15
++read 982528/982528 bytes at offset 66048
-diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
++959.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-index XXXXXXX..XXXXXXX 100755
++*** done
---- a/tests/qemu-iotests/140
+diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
-+++ b/tests/qemu-iotests/140
+index XXXXXXX..XXXXXXX 100644
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+--- a/tests/qemu-iotests/group
++++ b/tests/qemu-iotests/group
- _cleanup()
+@@ -XXX,XX +XXX,XX @@
- {
+rw
-+    _cleanup_qemu
+rw quick
-     _cleanup_test_img
+rw quick migration
-     rm -f "$TEST_DIR/nbd"
++263 rw quick
- }
+rw auto quick
-diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
+rw quick
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/141
 +++ b/tests/qemu-iotests/141
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      _cleanup_test_img
      rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
  }
 diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/143
 +++ b/tests/qemu-iotests/143
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      rm -f "$TEST_DIR/nbd"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/156
 +++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      rm -f "$TEST_IMG{,.target}{,.backing,.overlay}"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 --
-.9.3
+.21.0

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)

are available in the git repository at:

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

-- 
2.9.3

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
index XXXXXXX..XXXXXXX 100644
--- 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
index XXXXXXX..XXXXXXX 100644
--- 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
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/block/vxhs.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * QEMU Block driver for Veritas HyperScale (VxHS)
+ *
+ * Copyright (c) 2017 Veritas Technologies LLC.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#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 "trace.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");
+        return;
+    }
+
+    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();
+    }
+}
+
+static void vxhs_get_tls_creds(const char *id, char **cacert,
+                               char **key, char **cert, Error **errp)
+{
+    Object *obj;
+    QCryptoTLSCreds *creds;
+    QCryptoTLSCredsX509 *creds_x509;
+
+    obj = object_resolve_path_component(
+        object_get_objects_root(), id);
+
+    if (!obj) {
+        error_setg(errp, "No TLS credentials with id '%s'",
+                   id);
+        return;
+    }
+
+    creds_x509 = (QCryptoTLSCredsX509 *)
+        object_dynamic_cast(obj, TYPE_QCRYPTO_TLS_CREDS_X509);
+
+    if (!creds_x509) {
+        error_setg(errp, "Object with id '%s' is not TLS credentials",
+                   id);
+        return;
+    }
+
+    creds = &creds_x509->parent_obj;
+
+    if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
+        error_setg(errp,
+                   "Expecting TLS credentials with a client endpoint");
+        return;
+    }
+
+    /*
+     * Get the cacert, client_cert and client_key file names.
+     */
+    if (!creds->dir) {
+        error_setg(errp, "TLS object missing 'dir' property value");
+        return;
+    }
+
+    *cacert = g_strdup_printf("%s/%s", creds->dir,
+                              QCRYPTO_TLS_CREDS_X509_CA_CERT);
+    *cert = g_strdup_printf("%s/%s", creds->dir,
+                            QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
+    *key = g_strdup_printf("%s/%s", creds->dir,
+                           QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
+}
+
+static int vxhs_open(BlockDriverState *bs, QDict *options,
+                     int bdrv_flags, Error **errp)
+{
+    BDRVVXHSState *s = bs->opaque;
+    void *dev_handlep;
+    QDict *backing_options = NULL;
+    QemuOpts *opts = NULL;
+    QemuOpts *tcp_opts = NULL;
+    char *of_vsa_addr = NULL;
+    Error *local_err = NULL;
+    const char *vdisk_id_opt;
+    const char *server_host_opt;
+    int ret = 0;
+    char *cacert = NULL;
+    char *client_key = NULL;
+    char *client_cert = NULL;
+
+    ret = vxhs_init_and_ref();
+    if (ret < 0) {
+        ret = -EINVAL;
+        goto out;
+    }
+
+    /* Create opts info from runtime_opts and runtime_tcp_opts list */
+    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
+    tcp_opts = qemu_opts_create(&runtime_tcp_opts, NULL, 0, &error_abort);
+
+    qemu_opts_absorb_qdict(opts, options, &local_err);
+    if (local_err) {
+        ret = -EINVAL;
+        goto out;
+    }
+
+    /* vdisk-id is the disk UUID */
+    vdisk_id_opt = qemu_opt_get(opts, VXHS_OPT_VDISK_ID);
+    if (!vdisk_id_opt) {
+        error_setg(&local_err, QERR_MISSING_PARAMETER, VXHS_OPT_VDISK_ID);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    /* vdisk-id may contain a leading '/' */
+    if (strlen(vdisk_id_opt) > UUID_FMT_LEN + 1) {
+        error_setg(&local_err, "vdisk-id cannot be more than %d characters",
+                   UUID_FMT_LEN);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    s->vdisk_guid = g_strdup(vdisk_id_opt);
+    trace_vxhs_open_vdiskid(vdisk_id_opt);
+
+    /* get the 'server.' arguments */
+    qdict_extract_subqdict(options, &backing_options, VXHS_OPT_SERVER".");
+
+    qemu_opts_absorb_qdict(tcp_opts, backing_options, &local_err);
+    if (local_err != NULL) {
+        ret = -EINVAL;
+        goto out;
+    }
+
+    server_host_opt = qemu_opt_get(tcp_opts, VXHS_OPT_HOST);
+    if (!server_host_opt) {
+        error_setg(&local_err, QERR_MISSING_PARAMETER,
+                   VXHS_OPT_SERVER"."VXHS_OPT_HOST);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    if (strlen(server_host_opt) > MAXHOSTNAMELEN) {
+        error_setg(&local_err, "server.host cannot be more than %d characters",
+                   MAXHOSTNAMELEN);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    /* check if we got tls-creds via the --object argument */
+    s->tlscredsid = g_strdup(qemu_opt_get(opts, "tls-creds"));
+    if (s->tlscredsid) {
+        vxhs_get_tls_creds(s->tlscredsid, &cacert, &client_key,
+                           &client_cert, &local_err);
+        if (local_err != NULL) {
+            ret = -EINVAL;
+            goto out;
+        }
+        trace_vxhs_get_creds(cacert, client_key, client_cert);
+    }
+
+    s->vdisk_hostinfo.host = g_strdup(server_host_opt);
+    s->vdisk_hostinfo.port = g_ascii_strtoll(qemu_opt_get(tcp_opts,
+                                                          VXHS_OPT_PORT),
+                                                          NULL, 0);
+
+    trace_vxhs_open_hostinfo(s->vdisk_hostinfo.host,
+                             s->vdisk_hostinfo.port);
+
+    of_vsa_addr = g_strdup_printf("of://%s:%d",
+                                  s->vdisk_hostinfo.host,
+                                  s->vdisk_hostinfo.port);
+
+    /*
+     * Open qnio channel to storage agent if not opened before
+     */
+    dev_handlep = iio_open(of_vsa_addr, s->vdisk_guid, 0,
+                           cacert, client_key, client_cert);
+    if (dev_handlep == NULL) {
+        trace_vxhs_open_iio_open(of_vsa_addr);
+        ret = -ENODEV;
+        goto out;
+    }
+    s->vdisk_hostinfo.dev_handle = dev_handlep;
+
+out:
+    g_free(of_vsa_addr);
+    QDECREF(backing_options);
+    qemu_opts_del(tcp_opts);
+    qemu_opts_del(opts);
+    g_free(cacert);
+    g_free(client_key);
+    g_free(client_cert);
+
+    if (ret < 0) {
+        vxhs_unref();
+        error_propagate(errp, local_err);
+        g_free(s->vdisk_hostinfo.host);
+        g_free(s->vdisk_guid);
+        g_free(s->tlscredsid);
+        s->vdisk_guid = NULL;
+    }
+
+    return ret;
+}
+
+static const AIOCBInfo vxhs_aiocb_info = {
+    .aiocb_size = sizeof(VXHSAIOCB)
+};
+
+/*
+ * This allocates QEMU-VXHS callback for each IO
+ * and is passed to QNIO. When QNIO completes the work,
+ * it will be passed back through the callback.
+ */
+static BlockAIOCB *vxhs_aio_rw(BlockDriverState *bs, int64_t sector_num,
+                               QEMUIOVector *qiov, int nb_sectors,
+                               BlockCompletionFunc *cb, void *opaque,
+                               VDISKAIOCmd iodir)
+{
+    VXHSAIOCB *acb = NULL;
+    BDRVVXHSState *s = bs->opaque;
+    size_t size;
+    uint64_t offset;
+    int iio_flags = 0;
+    int ret = 0;
+    void *dev_handle = s->vdisk_hostinfo.dev_handle;
+
+    offset = sector_num * BDRV_SECTOR_SIZE;
+    size = nb_sectors * BDRV_SECTOR_SIZE;
+    acb = qemu_aio_get(&vxhs_aiocb_info, bs, cb, opaque);
+
+    /*
+     * Initialize VXHSAIOCB.
+     */
+    acb->err = 0;
+
+    iio_flags = IIO_FLAG_ASYNC;
+
+    switch (iodir) {
+    case VDISK_AIO_WRITE:
+            ret = iio_writev(dev_handle, acb, qiov->iov, qiov->niov,
+                             offset, (uint64_t)size, iio_flags);
+            break;
+    case VDISK_AIO_READ:
+            ret = iio_readv(dev_handle, acb, qiov->iov, qiov->niov,
+                            offset, (uint64_t)size, iio_flags);
+            break;
+    default:
+            trace_vxhs_aio_rw_invalid(iodir);
+            goto errout;
+    }
+
+    if (ret != 0) {
+        trace_vxhs_aio_rw_ioerr(s->vdisk_guid, iodir, size, offset,
+                                acb, ret, errno);
+        goto errout;
+    }
+    return &acb->common;
+
+errout:
+    qemu_aio_unref(acb);
+    return NULL;
+}
+
+static BlockAIOCB *vxhs_aio_readv(BlockDriverState *bs,
+                                   int64_t sector_num, QEMUIOVector *qiov,
+                                   int nb_sectors,
+                                   BlockCompletionFunc *cb, void *opaque)
+{
+    return vxhs_aio_rw(bs, sector_num, qiov, nb_sectors, cb,
+                       opaque, VDISK_AIO_READ);
+}
+
+static BlockAIOCB *vxhs_aio_writev(BlockDriverState *bs,
+                                   int64_t sector_num, QEMUIOVector *qiov,
+                                   int nb_sectors,
+                                   BlockCompletionFunc *cb, void *opaque)
+{
+    return vxhs_aio_rw(bs, sector_num, qiov, nb_sectors,
+                       cb, opaque, VDISK_AIO_WRITE);
+}
+
+static void vxhs_close(BlockDriverState *bs)
+{
+    BDRVVXHSState *s = bs->opaque;
+
+    trace_vxhs_close(s->vdisk_guid);
+
+    g_free(s->vdisk_guid);
+    s->vdisk_guid = NULL;
+
+    /*
+     * Close vDisk device
+     */
+    if (s->vdisk_hostinfo.dev_handle) {
+        iio_close(s->vdisk_hostinfo.dev_handle);
+        s->vdisk_hostinfo.dev_handle = NULL;
+    }
+
+    vxhs_unref();
+
+    /*
+     * Free the dynamically allocated host string etc
+     */
+    g_free(s->vdisk_hostinfo.host);
+    g_free(s->tlscredsid);
+    s->tlscredsid = NULL;
+    s->vdisk_hostinfo.host = NULL;
+    s->vdisk_hostinfo.port = 0;
+}
+
+static int64_t vxhs_get_vdisk_stat(BDRVVXHSState *s)
+{
+    int64_t vdisk_size = -1;
+    int ret = 0;
+    void *dev_handle = s->vdisk_hostinfo.dev_handle;
+
+    ret = iio_ioctl(dev_handle, IOR_VDISK_STAT, &vdisk_size, 0);
+    if (ret < 0) {
+        trace_vxhs_get_vdisk_stat_err(s->vdisk_guid, ret, errno);
+        return -EIO;
+    }
+
+    trace_vxhs_get_vdisk_stat(s->vdisk_guid, vdisk_size);
+    return vdisk_size;
+}
+
+/*
+ * Returns the size of vDisk in bytes. This is required
+ * by QEMU block upper block layer so that it is visible
+ * to guest.
+ */
+static int64_t vxhs_getlength(BlockDriverState *bs)
+{
+    BDRVVXHSState *s = bs->opaque;
+    int64_t vdisk_size;
+
+    vdisk_size = vxhs_get_vdisk_stat(s);
+    if (vdisk_size < 0) {
+        return -EIO;
+    }
+
+    return vdisk_size;
+}
+
+static BlockDriver bdrv_vxhs = {
+    .format_name                  = "vxhs",
+    .protocol_name                = "vxhs",
+    .instance_size                = sizeof(BDRVVXHSState),
+    .bdrv_file_open               = vxhs_open,
+    .bdrv_parse_filename          = vxhs_parse_filename,
+    .bdrv_close                   = vxhs_close,
+    .bdrv_getlength               = vxhs_getlength,
+    .bdrv_aio_readv               = vxhs_aio_readv,
+    .bdrv_aio_writev              = vxhs_aio_writev,
+};
+
+static void bdrv_vxhs_init(void)
+{
+    bdrv_register(&bdrv_vxhs);
+}
+
+block_init(bdrv_vxhs_init);
diff --git a/configure b/configure
index XXXXXXX..XXXXXXX 100755
--- a/configure
+++ b/configure
@@ -XXX,XX +XXX,XX @@ numa=""
 tcmalloc="no"
 jemalloc="no"
 replication="yes"
+vxhs=""
 
 supported_cpu="no"
 supported_os="no"
@@ -XXX,XX +XXX,XX @@ for opt do
   ;;
   --enable-replication) replication="yes"
   ;;
+  --disable-vxhs) vxhs="no"
+  ;;
+  --enable-vxhs) vxhs="yes"
+  ;;
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available:
   xfsctl          xfsctl support
   qom-cast-debug  cast debugging support
   tools           build qemu-io, qemu-nbd and qemu-image tools
+  vxhs            Veritas HyperScale vDisk backend support
 
 NOTE: The object files are built at the place where configure is launched
 EOF
@@ -XXX,XX +XXX,XX @@ if compile_prog "" "" ; then
 fi
 
 ##########################################
+# Veritas HyperScale block driver VxHS
+# Check if libvxhs is installed
+
+if test "$vxhs" != "no" ; then
+  cat > $TMPC <<EOF
+#include <stdint.h>
+#include <qnio/qnio_api.h>
+
+void *vxhs_callback;
+
+int main(void) {
+    iio_init(QNIO_VERSION, vxhs_callback);
+    return 0;
+}
+EOF
+  vxhs_libs="-lvxhs -lssl"
+  if compile_prog "" "$vxhs_libs" ; then
+    vxhs=yes
+  else
+    if test "$vxhs" = "yes" ; then
+      feature_not_found "vxhs block device" "Install libvxhs See github"
+    fi
+    vxhs=no
+  fi
+fi
+
+##########################################
 # End of CC checks
 # After here, no more $cc or $ld runs
 
@@ -XXX,XX +XXX,XX @@ echo "tcmalloc support  $tcmalloc"
 echo "jemalloc support  $jemalloc"
 echo "avx2 optimization $avx2_opt"
 echo "replication support $replication"
+echo "VxHS block device $vxhs"
 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -XXX,XX +XXX,XX @@ if test "$pthread_setname_np" = "yes" ; then
   echo "CONFIG_PTHREAD_SETNAME_NP=y" >> $config_host_mak
 fi
 
+if test "$vxhs" = "yes" ; then
+  echo "CONFIG_VXHS=y" >> $config_host_mak
+  echo "VXHS_LIBS=$vxhs_libs" >> $config_host_mak
+fi
+
 if test "$tcg_interpreter" = "yes"; then
   QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"
 elif test "$ARCH" = "sparc64" ; then
diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #
 # Drivers that are supported in block device operations.
 #
+# @vxhs: Since 2.10
+#
 # Since: 2.9
 ##
 { 'enum': 'BlockdevDriver',
@@ -XXX,XX +XXX,XX @@
             'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
             'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
             'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh',
-            'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
+            'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
 
 ##
 # @BlockdevOptionsFile:
@@ -XXX,XX +XXX,XX @@
   'data': { '*offset': 'int', '*size': 'int' } }
 
 ##
+# @BlockdevOptionsVxHS:
+#
+# Driver specific block device options for VxHS
+#
+# @vdisk-id:    UUID of VxHS volume
+# @server:      vxhs server IP, port
+# @tls-creds:   TLS credentials ID
+#
+# Since: 2.10
+##
+{ 'struct': 'BlockdevOptionsVxHS',
+  'data': { 'vdisk-id': 'str',
+            'server': 'InetSocketAddressBase',
+            '*tls-creds': 'str' } }
+
+##
 # @BlockdevOptions:
 #
 # Options for creating a block device.  Many options are available for all
@@ -XXX,XX +XXX,XX @@
       'vhdx':       'BlockdevOptionsGenericFormat',
       'vmdk':       'BlockdevOptionsGenericCOWFormat',
       'vpc':        'BlockdevOptionsGenericFormat',
-      'vvfat':      'BlockdevOptionsVVFAT'
+      'vvfat':      'BlockdevOptionsVVFAT',
+      'vxhs':       'BlockdevOptionsVxHS'
   } }
 
 ##
-- 
2.9.3

From: Ashish Mittal <ashmit602@gmail.com>

These changes use a vxhs test server that is a part of the following
repository:
https://github.com/VeritasHyperScale/libqnio.git

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-3-git-send-email-Ashish.Mittal@veritas.com
---
 tests/qemu-iotests/common        |  6 ++++++
 tests/qemu-iotests/common.config | 13 +++++++++++++
 tests/qemu-iotests/common.filter |  1 +
 tests/qemu-iotests/common.rc     | 19 +++++++++++++++++++
 4 files changed, 39 insertions(+)

diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -XXX,XX +XXX,XX @@ check options
     -ssh                test ssh
     -nfs                test nfs
     -luks               test luks
+    -vxhs               test vxhs
     -xdiff              graphical mode diff
     -nocache            use O_DIRECT on backing file
     -misalign           misalign memory allocations
@@ -XXX,XX +XXX,XX @@ testlist options
             xpand=false
             ;;
 
+        -vxhs)
+            IMGPROTO=vxhs
+            xpand=false
+            ;;
+
         -ssh)
             IMGPROTO=ssh
             xpand=false
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -XXX,XX +XXX,XX @@ if [ -z "$QEMU_NBD_PROG" ]; then
     export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
 fi
 
+if [ -z "$QEMU_VXHS_PROG" ]; then
+    export QEMU_VXHS_PROG="`set_prog_path qnio_server`"
+fi
+
 _qemu_wrapper()
 {
     (
@@ -XXX,XX +XXX,XX @@ _qemu_nbd_wrapper()
     )
 }
 
+_qemu_vxhs_wrapper()
+{
+    (
+        echo $BASHPID > "${TEST_DIR}/qemu-vxhs.pid"
+        exec "$QEMU_VXHS_PROG" $QEMU_VXHS_OPTIONS "$@"
+    )
+}
+
 export QEMU=_qemu_wrapper
 export QEMU_IMG=_qemu_img_wrapper
 export QEMU_IO=_qemu_io_wrapper
 export QEMU_NBD=_qemu_nbd_wrapper
+export QEMU_VXHS=_qemu_vxhs_wrapper
 
 QEMU_IMG_EXTRA_ARGS=
 if [ "$IMGOPTSSYNTAX" = "true" ]; then
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -XXX,XX +XXX,XX @@ _filter_img_info()
         -e "s#$TEST_DIR#TEST_DIR#g" \
         -e "s#$IMGFMT#IMGFMT#g" \
         -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \
+        -e 's#json.*vdisk-id.*vxhs"}}#TEST_DIR/t.IMGFMT#' \
         -e "/encrypted: yes/d" \
         -e "/cluster_size: [0-9]\\+/d" \
         -e "/table_size: [0-9]\\+/d" \
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ else
     elif [ "$IMGPROTO" = "nfs" ]; then
         TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
         TEST_IMG=$TEST_DIR/t.$IMGFMT
+    elif [ "$IMGPROTO" = "vxhs" ]; then
+        TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
+        TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT"
     else
         TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
     fi
@@ -XXX,XX +XXX,XX @@ _make_test_img()
         eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT  $TEST_IMG_FILE >/dev/null &"
         sleep 1 # FIXME: qemu-nbd needs to be listening before we continue
     fi
+
+    # Start QNIO server on image directory for vxhs protocol
+    if [ $IMGPROTO = "vxhs" ]; then
+        eval "$QEMU_VXHS -d  $TEST_DIR > /dev/null &"
+        sleep 1 # Wait for server to come up.
+    fi
 }
 
 _rm_test_img()
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img()
             fi
             rm -f "$TEST_IMG_FILE"
             ;;
+        vxhs)
+            if [ -f "${TEST_DIR}/qemu-vxhs.pid" ]; then
+                local QEMU_VXHS_PID
+                read QEMU_VXHS_PID < "${TEST_DIR}/qemu-vxhs.pid"
+                kill ${QEMU_VXHS_PID} >/dev/null 2>&1
+                rm -f "${TEST_DIR}/qemu-vxhs.pid"
+            fi
+            rm -f "$TEST_IMG_FILE"
+            ;;
+
         file)
             _rm_test_img "$TEST_DIR/t.$IMGFMT"
             _rm_test_img "$TEST_DIR/t.$IMGFMT.orig"
-- 
2.9.3

The protocol VXHS does not support image creation.  Some tests expect
to be able to create images through the protocol.  Exclude VXHS from
these tests.

diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting intenal snapshots
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 CLUSTER_SIZE=64k
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 qemu_comm_method="monitor"
diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/134
+++ b/tests/qemu-iotests/134
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qed
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 # Create source disk
diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/158
+++ b/tests/qemu-iotests/158
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 
-- 
2.9.3

We have a helper wrapper for checking for the BDS read_only flag,
add a helper wrapper to set the read_only flag as well.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 9b18972d05f5fa2ac16c014f0af98d680553048d.1491597120.git.jcody@redhat.com
---
 block.c               | 5 +++++
 block/bochs.c         | 2 +-
 block/cloop.c         | 2 +-
 block/dmg.c           | 2 +-
 block/rbd.c           | 2 +-
 block/vvfat.c         | 4 ++--
 include/block/block.h | 1 +
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
     }
 }
 
+void bdrv_set_read_only(BlockDriverState *bs, bool read_only)
+{
+    bs->read_only = read_only;
+}
+
 void bdrv_get_full_backing_filename_from_filename(const char *backed,
                                                   const char *backing,
                                                   char *dest, size_t sz,
diff --git a/block/bochs.c b/block/bochs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bs->read_only = true; /* no write support yet */
+    bdrv_set_read_only(bs, true); /* no write support yet */
 
     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
     if (ret < 0) {
diff --git a/block/cloop.c b/block/cloop.c
index XXXXXXX..XXXXXXX 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bs->read_only = true;
+    bdrv_set_read_only(bs, true);
 
     /* read header */
     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
diff --git a/block/dmg.c b/block/dmg.c
index XXXXXXX..XXXXXXX 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     block_module_load_one("dmg-bz2");
-    bs->read_only = true;
+    bdrv_set_read_only(bs, true);
 
     s->n_chunks = 0;
     s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
         goto failed_open;
     }
 
-    bs->read_only = (s->snap != NULL);
+    bdrv_set_read_only(bs, (s->snap != NULL));
 
     qemu_opts_del(opts);
     return 0;
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
     s->current_cluster=0xffffffff;
 
     /* read only is the default for safety */
-    bs->read_only = true;
+    bdrv_set_read_only(bs, true);
     s->qcow = NULL;
     s->qcow_filename = NULL;
     s->fat2 = NULL;
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
         if (ret < 0) {
             goto fail;
         }
-        bs->read_only = false;
+        bdrv_set_read_only(bs, false);
     }
 
     bs->total_sectors = cyls * heads * secs;
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                             int64_t sector_num, int nb_sectors, int *pnum);
 
 bool bdrv_is_read_only(BlockDriverState *bs);
+void bdrv_set_read_only(BlockDriverState *bs, bool read_only);
 bool bdrv_is_sg(BlockDriverState *bs);
 bool bdrv_is_inserted(BlockDriverState *bs);
 int bdrv_media_changed(BlockDriverState *bs);
-- 
2.9.3

A few block drivers will set the BDS read_only flag from their
.bdrv_open() function.  This means the bs->read_only flag could
be set after we enable copy_on_read, as the BDRV_O_COPY_ON_READ
flag check occurs prior to the call to bdrv->bdrv_open().

This adds an error return to bdrv_set_read_only(), and an error will be
return if we try to set the BDS to read_only while copy_on_read is
enabled.

This patch also changes the behavior of vvfat.  Before, vvfat could
override the drive 'readonly' flag with its own, internal 'rw' flag.

For instance, this -drive parameter would result in a writable image:

"-drive format=vvfat,dir=/tmp/vvfat,rw,if=virtio,readonly=on"

This is not correct.  Now, attempting to use the above -drive parameter
will result in an error (i.e., 'rw' is incompatible with 'readonly=on').

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 0c5b4c1cc2c651471b131f21376dfd5ea24d2196.1491597120.git.jcody@redhat.com
---
 block.c               | 10 +++++++++-
 block/bochs.c         |  5 ++++-
 block/cloop.c         |  5 ++++-
 block/dmg.c           |  6 +++++-
 block/rbd.c           | 11 ++++++++++-
 block/vvfat.c         | 19 +++++++++++++++----
 include/block/block.h |  2 +-
 7 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
     }
 }
 
-void bdrv_set_read_only(BlockDriverState *bs, bool read_only)
+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
 {
+    /* Do not set read_only if copy_on_read is enabled */
+    if (bs->copy_on_read && read_only) {
+        error_setg(errp, "Can't set node '%s' to r/o with copy-on-read enabled",
+                   bdrv_get_device_or_node_name(bs));
+        return -EINVAL;
+    }
+
     bs->read_only = read_only;
+    return 0;
 }
 
 void bdrv_get_full_backing_filename_from_filename(const char *backed,
diff --git a/block/bochs.c b/block/bochs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bdrv_set_read_only(bs, true); /* no write support yet */
+    ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */
+    if (ret < 0) {
+        return ret;
+    }
 
     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
     if (ret < 0) {
diff --git a/block/cloop.c b/block/cloop.c
index XXXXXXX..XXXXXXX 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bdrv_set_read_only(bs, true);
+    ret = bdrv_set_read_only(bs, true, errp);
+    if (ret < 0) {
+        return ret;
+    }
 
     /* read header */
     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
diff --git a/block/dmg.c b/block/dmg.c
index XXXXXXX..XXXXXXX 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
+    ret = bdrv_set_read_only(bs, true, errp);
+    if (ret < 0) {
+        return ret;
+    }
+
     block_module_load_one("dmg-bz2");
-    bdrv_set_read_only(bs, true);
 
     s->n_chunks = 0;
     s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
         goto failed_shutdown;
     }
 
+    /* rbd_open is always r/w */
     r = rbd_open(s->io_ctx, s->name, &s->image, s->snap);
     if (r < 0) {
         error_setg_errno(errp, -r, "error reading header from %s", s->name);
         goto failed_open;
     }
 
-    bdrv_set_read_only(bs, (s->snap != NULL));
+    /* If we are using an rbd snapshot, we must be r/o, otherwise
+     * leave as-is */
+    if (s->snap != NULL) {
+        r = bdrv_set_read_only(bs, true, &local_err);
+        if (r < 0) {
+            error_propagate(errp, local_err);
+            goto failed_open;
+        }
+    }
 
     qemu_opts_del(opts);
     return 0;
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
 
     s->current_cluster=0xffffffff;
 
-    /* read only is the default for safety */
-    bdrv_set_read_only(bs, true);
     s->qcow = NULL;
     s->qcow_filename = NULL;
     s->fat2 = NULL;
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
     s->sector_count = cyls * heads * secs - (s->first_sectors_number - 1);
 
     if (qemu_opt_get_bool(opts, "rw", false)) {
-        ret = enable_write_target(bs, errp);
+        if (!bdrv_is_read_only(bs)) {
+            ret = enable_write_target(bs, errp);
+            if (ret < 0) {
+                goto fail;
+            }
+        } else {
+            ret = -EPERM;
+            error_setg(errp,
+                       "Unable to set VVFAT to 'rw' when drive is read-only");
+            goto fail;
+        }
+    } else  {
+        /* read only is the default for safety */
+        ret = bdrv_set_read_only(bs, true, &local_err);
         if (ret < 0) {
+            error_propagate(errp, local_err);
             goto fail;
         }
-        bdrv_set_read_only(bs, false);
     }
 
     bs->total_sectors = cyls * heads * secs;
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                             int64_t sector_num, int nb_sectors, int *pnum);
 
 bool bdrv_is_read_only(BlockDriverState *bs);
-void bdrv_set_read_only(BlockDriverState *bs, bool read_only);
+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
 bool bdrv_is_sg(BlockDriverState *bs);
 bool bdrv_is_inserted(BlockDriverState *bs);
 int bdrv_media_changed(BlockDriverState *bs);
-- 
2.9.3

The BDRV_O_ALLOW_RDWR flag allows / prohibits the changing of
the BDS 'read_only' state, but there are a few places where it
is ignored.  In the bdrv_set_read_only() helper, make sure to
honor the flag.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: be2e5fb2d285cbece2b6d06bed54a6f56520d251.1491597120.git.jcody@redhat.com
---
 block.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
         return -EINVAL;
     }
 
+    /* Do not clear read_only if it is prohibited */
+    if (!read_only && !(bs->open_flags & BDRV_O_ALLOW_RDWR)) {
+        error_setg(errp, "Node '%s' is read only",
+                   bdrv_get_device_or_node_name(bs));
+        return -EPERM;
+    }
+
     bs->read_only = read_only;
     return 0;
 }
-- 
2.9.3

Move bdrv_is_read_only() up with its friends.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 73b2399459760c32506f9407efb9dddb3a2789de.1491597120.git.jcody@redhat.com
---
 block.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
     }
 }
 
+bool bdrv_is_read_only(BlockDriverState *bs)
+{
+    return bs->read_only;
+}
+
 int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
 {
     /* Do not set read_only if copy_on_read is enabled */
@@ -XXX,XX +XXX,XX @@ void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr)
     *nb_sectors_ptr = nb_sectors < 0 ? 0 : nb_sectors;
 }
 
-bool bdrv_is_read_only(BlockDriverState *bs)
-{
-    return bs->read_only;
-}
-
 bool bdrv_is_sg(BlockDriverState *bs)
 {
     return bs->sg;
-- 
2.9.3

Introduce check function for setting read_only flags.  Will return < 0 on
error, with appropriate Error value set.  Does not alter any flags.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: e2bba34ac3bc76a0c42adc390413f358ae0566e8.1491597120.git.jcody@redhat.com
---
 block.c               | 14 +++++++++++++-
 include/block/block.h |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ bool bdrv_is_read_only(BlockDriverState *bs)
     return bs->read_only;
 }
 
-int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
 {
     /* Do not set read_only if copy_on_read is enabled */
     if (bs->copy_on_read && read_only) {
@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
         return -EPERM;
     }
 
+    return 0;
+}
+
+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+{
+    int ret = 0;
+
+    ret = bdrv_can_set_read_only(bs, read_only, errp);
+    if (ret < 0) {
+        return ret;
+    }
+
     bs->read_only = read_only;
     return 0;
 }
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                             int64_t sector_num, int nb_sectors, int *pnum);
 
 bool bdrv_is_read_only(BlockDriverState *bs);
+int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
 int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
 bool bdrv_is_sg(BlockDriverState *bs);
 bool bdrv_is_inserted(BlockDriverState *bs);
-- 
2.9.3

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 00aed7ffdd7be4b9ed9ce1007d50028a72b34ebe.1491597120.git.jcody@redhat.com
---
 block.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
     BlockDriver *drv;
     QemuOpts *opts;
     const char *value;
+    bool read_only;
 
     assert(reopen_state != NULL);
     assert(reopen_state->bs->drv != NULL);
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
         qdict_put(reopen_state->options, "driver", qstring_from_str(value));
     }
 
-    /* if we are to stay read-only, do not allow permission change
-     * to r/w */
-    if (!(reopen_state->bs->open_flags & BDRV_O_ALLOW_RDWR) &&
-        reopen_state->flags & BDRV_O_RDWR) {
-        error_setg(errp, "Node '%s' is read only",
-                   bdrv_get_device_or_node_name(reopen_state->bs));
+    /* If we are to stay read-only, do not allow permission change
+     * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is
+     * not set, or if the BDS still has copy_on_read enabled */
+    read_only = !(reopen_state->flags & BDRV_O_RDWR);
+    ret = bdrv_can_set_read_only(reopen_state->bs, read_only, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
         goto error;
     }
 
-- 
2.9.3

Update 'clientname' to be 'user', which tracks better with both
the QAPI and rados variable naming.

Update 'name' to be 'image_name', as it indicates the rbd image.
Naming it 'image' would have been ideal, but we are using that for
the rados_image_t value returned by rbd_open().

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: b7ec1fb2e1cf36f9b6911631447a5b0422590b7d.1491597120.git.jcody@redhat.com
---
 block/rbd.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRBDState {
     rados_t cluster;
     rados_ioctx_t io_ctx;
     rbd_image_t image;
-    char *name;
+    char *image_name;
     char *snap;
 } BDRVRBDState;
 
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
     int64_t bytes = 0;
     int64_t objsize;
     int obj_order = 0;
-    const char *pool, *name, *conf, *clientname, *keypairs;
+    const char *pool, *image_name, *conf, *user, *keypairs;
     const char *secretid;
     rados_t cluster;
     rados_ioctx_t io_ctx;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
      */
     pool       = qdict_get_try_str(options, "pool");
     conf       = qdict_get_try_str(options, "conf");
-    clientname = qdict_get_try_str(options, "user");
-    name       = qdict_get_try_str(options, "image");
+    user       = qdict_get_try_str(options, "user");
+    image_name = qdict_get_try_str(options, "image");
     keypairs   = qdict_get_try_str(options, "=keyvalue-pairs");
 
-    ret = rados_create(&cluster, clientname);
+    ret = rados_create(&cluster, user);
     if (ret < 0) {
         error_setg_errno(errp, -ret, "error initializing");
         goto exit;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
         goto shutdown;
     }
 
-    ret = rbd_create(io_ctx, name, bytes, &obj_order);
+    ret = rbd_create(io_ctx, image_name, bytes, &obj_order);
     if (ret < 0) {
         error_setg_errno(errp, -ret, "error rbd create");
     }
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
                          Error **errp)
 {
     BDRVRBDState *s = bs->opaque;
-    const char *pool, *snap, *conf, *clientname, *name, *keypairs;
+    const char *pool, *snap, *conf, *user, *image_name, *keypairs;
     const char *secretid;
     QemuOpts *opts;
     Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
     pool           = qemu_opt_get(opts, "pool");
     conf           = qemu_opt_get(opts, "conf");
     snap           = qemu_opt_get(opts, "snapshot");
-    clientname     = qemu_opt_get(opts, "user");
-    name           = qemu_opt_get(opts, "image");
+    user           = qemu_opt_get(opts, "user");
+    image_name     = qemu_opt_get(opts, "image");
     keypairs       = qemu_opt_get(opts, "=keyvalue-pairs");
 
-    if (!pool || !name) {
+    if (!pool || !image_name) {
         error_setg(errp, "Parameters 'pool' and 'image' are required");
         r = -EINVAL;
         goto failed_opts;
     }
 
-    r = rados_create(&s->cluster, clientname);
+    r = rados_create(&s->cluster, user);
     if (r < 0) {
         error_setg_errno(errp, -r, "error initializing");
         goto failed_opts;
     }
 
     s->snap = g_strdup(snap);
-    s->name = g_strdup(name);
+    s->image_name = g_strdup(image_name);
 
     /* try default location when conf=NULL, but ignore failure */
     r = rados_conf_read_file(s->cluster, conf);
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* rbd_open is always r/w */
-    r = rbd_open(s->io_ctx, s->name, &s->image, s->snap);
+    r = rbd_open(s->io_ctx, s->image_name, &s->image, s->snap);
     if (r < 0) {
-        error_setg_errno(errp, -r, "error reading header from %s", s->name);
+        error_setg_errno(errp, -r, "error reading header from %s",
+                         s->image_name);
         goto failed_open;
     }
 
@@ -XXX,XX +XXX,XX @@ failed_open:
 failed_shutdown:
     rados_shutdown(s->cluster);
     g_free(s->snap);
-    g_free(s->name);
+    g_free(s->image_name);
 failed_opts:
     qemu_opts_del(opts);
     g_free(mon_host);
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_close(BlockDriverState *bs)
     rbd_close(s->image);
     rados_ioctx_destroy(s->io_ctx);
     g_free(s->snap);
-    g_free(s->name);
+    g_free(s->image_name);
     rados_shutdown(s->cluster);
 }
 
-- 
2.9.3

This adds support for reopen in rbd, for changing between r/w and r/o.

Note, that this is only a flag change, but we will block a change from
r/o to r/w if we are using an RBD internal snapshot.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: d4e87539167ec6527d44c97b164eabcccf96e4f3.1491597120.git.jcody@redhat.com
---
 block/rbd.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ failed_opts:
     return r;
 }
 
+
+/* Since RBD is currently always opened R/W via the API,
+ * we just need to check if we are using a snapshot or not, in
+ * order to determine if we will allow it to be R/W */
+static int qemu_rbd_reopen_prepare(BDRVReopenState *state,
+                                   BlockReopenQueue *queue, Error **errp)
+{
+    BDRVRBDState *s = state->bs->opaque;
+    int ret = 0;
+
+    if (s->snap && state->flags & BDRV_O_RDWR) {
+        error_setg(errp,
+                   "Cannot change node '%s' to r/w when using RBD snapshot",
+                   bdrv_get_device_or_node_name(state->bs));
+        ret = -EINVAL;
+    }
+
+    return ret;
+}
+
 static void qemu_rbd_close(BlockDriverState *bs)
 {
     BDRVRBDState *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_rbd = {
     .bdrv_parse_filename    = qemu_rbd_parse_filename,
     .bdrv_file_open         = qemu_rbd_open,
     .bdrv_close             = qemu_rbd_close,
+    .bdrv_reopen_prepare    = qemu_rbd_reopen_prepare,
     .bdrv_create            = qemu_rbd_create,
     .bdrv_has_zero_init     = bdrv_has_zero_init_1,
     .bdrv_get_info          = qemu_rbd_getinfo,
-- 
2.9.3

For the tests that use the common.qemu functions for running a QEMU
process, _cleanup_qemu must be called in the exit function.

If it is not, if the qemu process aborts, then not all of the droppings
are cleaned up (e.g. pidfile, fifos).

This updates those tests that did not have a cleanup in qemu-iotests.

(I swapped spaces for tabs in test 102 as well)

Reported-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: d59c2f6ad6c1da8b9b3c7f357c94a7122ccfc55a.1492544096.git.jcody@redhat.com
---
 tests/qemu-iotests/028 |  1 +
 tests/qemu-iotests/094 | 11 ++++++++---
 tests/qemu-iotests/102 |  5 +++--
 tests/qemu-iotests/109 |  1 +
 tests/qemu-iotests/117 |  1 +
 tests/qemu-iotests/130 |  1 +
 tests/qemu-iotests/140 |  1 +
 tests/qemu-iotests/141 |  1 +
 tests/qemu-iotests/143 |  1 +
 tests/qemu-iotests/156 |  1 +
 10 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     rm -f "${TEST_IMG}.copy"
     _cleanup_test_img
 }
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -XXX,XX +XXX,XX @@ echo "QA output created by $seq"
 here="$PWD"
 status=1	# failure is the default!
 
-trap "exit \$status" 0 1 2 3 15
+_cleanup()
+{
+    _cleanup_qemu
+    _cleanup_test_img
+    rm -f "$TEST_DIR/source.$IMGFMT"
+}
+
+trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \
 
 wait=1 _cleanup_qemu
 
-_cleanup_test_img
-rm -f "$TEST_DIR/source.$IMGFMT"
 
 # success, all done
 echo '*** done'
diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102
@@ -XXX,XX +XXX,XX @@ seq=$(basename $0)
 echo "QA output created by $seq"
 
 here=$PWD
-status=1	# failure is the default!
+status=1    # failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
+    _cleanup_qemu
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/109
+++ b/tests/qemu-iotests/109
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     rm -f $TEST_IMG.src
 	_cleanup_test_img
 }
diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
 	_cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/140
+++ b/tests/qemu-iotests/140
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     _cleanup_test_img
     rm -f "$TEST_DIR/nbd"
 }
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     _cleanup_test_img
     rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
 }
diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/143
+++ b/tests/qemu-iotests/143
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     rm -f "$TEST_DIR/nbd"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     rm -f "$TEST_IMG{,.target}{,.backing,.overlay}"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
-- 
2.9.3

The following changes since commit dd25f97c66a75d1508f1d4c6478ed2c95bec428f:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190913' into staging (2019-09-16 10:15:15 +0100)

are available in the Git repository at:

https://github.com/XanClic/qemu.git tags/pull-block-2019-09-16

for you to fetch changes up to 1825cc0783ccf0ec5d9f0b225a99b340bdd4c68f:

qemu-iotests: Add test for bz #1745922 (2019-09-16 15:37:12 +0200)

----------------------------------------------------------------
Block patches:
- Fix for block jobs when used with I/O threads
- Fix for a corruption when using qcow2's LUKS encryption mode
- cURL fix
- check-block.sh cleanups (for make check)
- Refactoring

----------------------------------------------------------------
Max Reitz (7):
  curl: Keep pointer to the CURLState in CURLSocket
  curl: Keep *socket until the end of curl_sock_cb()
  curl: Check completion in curl_multi_do()
  curl: Pass CURLSocket to curl_multi_do()
  curl: Report only ready sockets
  curl: Handle success in multi_check_completion
  curl: Check curl_multi_add_handle()'s return code

Maxim Levitsky (3):
  block/qcow2: Fix corruption introduced by commit 8ac0f15f335
  block/qcow2: refactor encryption code
  qemu-iotests: Add test for bz #1745922

Nir Soffer (2):
  block: Use QEMU_IS_ALIGNED
  block: Remove unused masks

Sergio Lopez (1):
  blockjob: update nodes head while removing all bdrv

Thomas Huth (2):
  tests/qemu-iotests/check: Replace "tests" with "iotests" in final
    status text
  tests/Makefile: Do not print the name of the check-block.sh shell
    script

Vladimir Sementsov-Ogievskiy (1):
  tests/qemu-iotests: Fix qemu-io related output in 026.out.nocache

-- 
2.21.0

From: Nir Soffer <nirsof@gmail.com>

Replace instances of:

(n & (BDRV_SECTOR_SIZE - 1)) == 0

And:

(n & ~BDRV_SECTOR_MASK) == 0

With:

QEMU_IS_ALIGNED(n, BDRV_SECTOR_SIZE)

Which reveals the intent of the code better, and makes it easier to
locate the code checking alignment.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Message-id: 20190827185913.27427-2-nsoffer@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/bochs.c         | 4 ++--
 block/cloop.c         | 4 ++--
 block/dmg.c           | 4 ++--
 block/io.c            | 8 ++++----
 block/qcow2-cluster.c | 4 ++--
 block/qcow2.c         | 4 ++--
 block/vvfat.c         | 8 ++++----
 qemu-img.c            | 2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/block/bochs.c b/block/bochs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -XXX,XX +XXX,XX @@ bochs_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
     QEMUIOVector local_qiov;
     int ret;
 
-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
 
     qemu_iovec_init(&local_qiov, qiov->niov);
     qemu_co_mutex_lock(&s->lock);
diff --git a/block/cloop.c b/block/cloop.c
index XXXXXXX..XXXXXXX 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -XXX,XX +XXX,XX @@ cloop_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
     int nb_sectors = bytes >> BDRV_SECTOR_BITS;
     int ret, i;
 
-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
 
     qemu_co_mutex_lock(&s->lock);
 
diff --git a/block/dmg.c b/block/dmg.c
index XXXXXXX..XXXXXXX 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -XXX,XX +XXX,XX @@ dmg_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
     int nb_sectors = bytes >> BDRV_SECTOR_BITS;
     int ret, i;
 
-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
 
     qemu_co_mutex_lock(&s->lock);
 
diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_driver_preadv(BlockDriverState *bs,
     sector_num = offset >> BDRV_SECTOR_BITS;
     nb_sectors = bytes >> BDRV_SECTOR_BITS;
 
-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
     assert(bytes <= BDRV_REQUEST_MAX_BYTES);
     assert(drv->bdrv_co_readv);
 
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_driver_pwritev(BlockDriverState *bs,
     sector_num = offset >> BDRV_SECTOR_BITS;
     nb_sectors = bytes >> BDRV_SECTOR_BITS;
 
-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
     assert(bytes <= BDRV_REQUEST_MAX_BYTES);
 
     assert(drv->bdrv_co_writev);
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -XXX,XX +XXX,XX @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs,
 {
     if (bytes && bs->encrypted) {
         BDRVQcow2State *s = bs->opaque;
-        assert((offset_in_cluster & ~BDRV_SECTOR_MASK) == 0);
-        assert((bytes & ~BDRV_SECTOR_MASK) == 0);
+        assert(QEMU_IS_ALIGNED(offset_in_cluster, BDRV_SECTOR_SIZE));
+        assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
         assert(s->crypto);
         if (qcow2_co_encrypt(bs, cluster_offset,
                              src_cluster_offset + offset_in_cluster,
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
                     goto fail;
                 }
 
-                assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-                assert((cur_bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+                assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+                assert(QEMU_IS_ALIGNED(cur_bytes, BDRV_SECTOR_SIZE));
                 if (qcow2_co_decrypt(bs, cluster_offset, offset,
                                      cluster_data, cur_bytes) < 0) {
                     ret = -EIO;
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ vvfat_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
     int nb_sectors = bytes >> BDRV_SECTOR_BITS;
     void *buf;
 
-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
 
     buf = g_try_malloc(bytes);
     if (bytes && buf == NULL) {
@@ -XXX,XX +XXX,XX @@ vvfat_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
     int nb_sectors = bytes >> BDRV_SECTOR_BITS;
     void *buf;
 
-    assert((offset & (BDRV_SECTOR_SIZE - 1)) == 0);
-    assert((bytes & (BDRV_SECTOR_SIZE - 1)) == 0);
+    assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
 
     buf = g_try_malloc(bytes);
     if (bytes && buf == NULL) {
diff --git a/qemu-img.c b/qemu-img.c
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
             int64_t sval;
 
             sval = cvtnum(optarg);
-            if (sval < 0 || sval & (BDRV_SECTOR_SIZE - 1) ||
+            if (sval < 0 || !QEMU_IS_ALIGNED(sval, BDRV_SECTOR_SIZE) ||
                 sval / BDRV_SECTOR_SIZE > MAX_BUF_SECTORS) {
                 error_report("Invalid buffer size for sparse output specified. "
                     "Valid sizes are multiples of %llu up to %llu. Select "
-- 
2.21.0

From: Nir Soffer <nirsof@gmail.com>

Replace confusing usage:

~BDRV_SECTOR_MASK

With more clear:

(BDRV_SECTOR_SIZE - 1)

Remove BDRV_SECTOR_MASK and the unused BDRV_BLOCK_OFFSET_MASK which was
it's last user.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>
Message-id: 20190827185913.27427-3-nsoffer@redhat.com
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 include/block/block.h | 2 --
 migration/block.c     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
 
 #define BDRV_SECTOR_BITS   9
 #define BDRV_SECTOR_SIZE   (1ULL << BDRV_SECTOR_BITS)
-#define BDRV_SECTOR_MASK   ~(BDRV_SECTOR_SIZE - 1)
 
 #define BDRV_REQUEST_MAX_SECTORS MIN(SIZE_MAX >> BDRV_SECTOR_BITS, \
                                      INT_MAX >> BDRV_SECTOR_BITS)
@@ -XXX,XX +XXX,XX @@ typedef struct HDGeometry {
 #define BDRV_BLOCK_ALLOCATED    0x10
 #define BDRV_BLOCK_EOF          0x20
 #define BDRV_BLOCK_RECURSE      0x40
-#define BDRV_BLOCK_OFFSET_MASK  BDRV_SECTOR_MASK
 
 typedef QSIMPLEQ_HEAD(BlockReopenQueue, BlockReopenQueueEntry) BlockReopenQueue;
 
diff --git a/migration/block.c b/migration/block.c
index XXXXXXX..XXXXXXX 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -XXX,XX +XXX,XX @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
     do {
         addr = qemu_get_be64(f);
 
-        flags = addr & ~BDRV_SECTOR_MASK;
+        flags = addr & (BDRV_SECTOR_SIZE - 1);
         addr >>= BDRV_SECTOR_BITS;
 
         if (flags & BLK_MIG_FLAG_DEVICE_BLOCK) {
-- 
2.21.0

From: Thomas Huth <thuth@redhat.com>

When running "make check -j8" or something similar, the iotests are
running in parallel with the other tests. So when they are printing
out "Passed all xx tests" or a similar status message at the end,
it might not be quite clear that this message belongs to the iotests,
since the output might be mixed with the other tests. Thus change the
word "tests" here to "iotests" instead to avoid confusion.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 20190906113920.11271-1-thuth@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/check | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -XXX,XX +XXX,XX @@ END        { if (NR > 0) {
         if [ ! -z "$n_bad" -a $n_bad != 0 ]
         then
             echo "Failures:$bad"
-            echo "Failed $n_bad of $try tests"
+            echo "Failed $n_bad of $try iotests"
             echo "Failures:$bad" | fmt >>check.log
-            echo "Failed $n_bad of $try tests" >>check.log
+            echo "Failed $n_bad of $try iotests" >>check.log
         else
-            echo "Passed all $try tests"
-            echo "Passed all $try tests" >>check.log
+            echo "Passed all $try iotests"
+            echo "Passed all $try iotests" >>check.log
         fi
         needwrap=false
     fi
-- 
2.21.0

From: Thomas Huth <thuth@redhat.com>

The check script is already printing out which iotest is currently
running, so printing out the name of the check-block.sh shell script
looks superfluous here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 20190906113534.10907-1-thuth@redhat.com
Acked-by: John Snow <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index XXXXXXX..XXXXXXX 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -XXX,XX +XXX,XX @@ QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu
 check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) \
 		qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \
 		$(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS)))
-	$<
+	@$<
 
 .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
 $(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
-- 
2.21.0

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

qemu-io now prefixes its error and warnings with "qemu-io:".
36b9986b08787019e fixed a lot of iotests output but forget about
026.out.nocache. Fix it too.

Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190816153015.447957-2-vsementsov@virtuozzo.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/026.out.nocache | 168 ++++++++++++++---------------
 1 file changed, 84 insertions(+), 84 deletions(-)

diff --git a/tests/qemu-iotests/026.out.nocache b/tests/qemu-iotests/026.out.nocache
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/026.out.nocache
+++ b/tests/qemu-iotests/026.out.nocache
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_update; errno: 5; imm: off; once: off; write 
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_update; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_update; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_update; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_update; errno: 5; imm: off; once: off; write 
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l2_update; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
 
 Event: l2_update; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l2_update; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l2_alloc_write; errno: 5; imm: off; once: off; write 
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l2_alloc_write; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 1 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: write_aio; errno: 5; imm: off; once: off; write 
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: write_aio; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: write_aio; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: write_aio; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_load; errno: 5; imm: off; once: off; write 
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_load; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_load; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_load; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_update_part; errno: 5; imm: off; once: off; write 
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_update_part; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc; errno: 5; imm: off; once: off; write 
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 55 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 251 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_write; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 10 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 23 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 10 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 23 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write 
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 10 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 23 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_grow_write_table; errno: 5; imm: off; once: off
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_grow_write_table; errno: 28; imm: off; once: off
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_grow_activate_table; errno: 5; imm: off; once: off
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
 write failed: Input/output error
 
 96 leaked clusters were found on the image.
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 
 
 Event: l1_grow_activate_table; errno: 28; imm: off; once: off
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
 write failed: No space left on device
 
 96 leaked clusters were found on the image.
-- 
2.21.0

A follow-up patch will make curl_multi_do() and curl_multi_read() take a
CURLSocket instead of the CURLState.  They still need the latter,
though, so add a pointer to it to the former.

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190910124136.10565-2-mreitz@redhat.com
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/curl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/curl.c b/block/curl.c
index XXXXXXX..XXXXXXX 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -XXX,XX +XXX,XX @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,
 #define CURL_BLOCK_OPT_TIMEOUT_DEFAULT 5
 
 struct BDRVCURLState;
+struct CURLState;
 
 static bool libcurl_initialized;
 
@@ -XXX,XX +XXX,XX @@ typedef struct CURLAIOCB {
 
 typedef struct CURLSocket {
     int fd;
+    struct CURLState *state;
     QLIST_ENTRY(CURLSocket) next;
 } CURLSocket;
 
@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
     if (!socket) {
         socket = g_new0(CURLSocket, 1);
         socket->fd = fd;
+        socket->state = state;
         QLIST_INSERT_HEAD(&state->sockets, socket, next);
     }
     socket = NULL;
-- 
2.21.0

This does not really change anything, but it makes the code a bit easier
to follow once we use @socket as the opaque pointer for
aio_set_fd_handler().

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190910124136.10565-3-mreitz@redhat.com
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/curl.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/block/curl.c b/block/curl.c
index XXXXXXX..XXXXXXX 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
 
     QLIST_FOREACH(socket, &state->sockets, next) {
         if (socket->fd == fd) {
-            if (action == CURL_POLL_REMOVE) {
-                QLIST_REMOVE(socket, next);
-                g_free(socket);
-            }
             break;
         }
     }
@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
         socket->state = state;
         QLIST_INSERT_HEAD(&state->sockets, socket, next);
     }
-    socket = NULL;
 
     trace_curl_sock_cb(action, (int)fd);
     switch (action) {
@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
             break;
     }
 
+    if (action == CURL_POLL_REMOVE) {
+        QLIST_REMOVE(socket, next);
+        g_free(socket);
+    }
+
     return 0;
 }
 
-- 
2.21.0

While it is more likely that transfers complete after some file
descriptor has data ready to read, we probably should not rely on it.
Better be safe than sorry and call curl_multi_check_completion() in
curl_multi_do(), too, just like it is done in curl_multi_read().

With this change, curl_multi_do() and curl_multi_read() are actually the
same, so drop curl_multi_read() and use curl_multi_do() as the sole FD
handler.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190910124136.10565-4-mreitz@redhat.com
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/curl.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/block/curl.c b/block/curl.c
index XXXXXXX..XXXXXXX 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVCURLState {
 
 static void curl_clean_state(CURLState *s);
 static void curl_multi_do(void *arg);
-static void curl_multi_read(void *arg);
 
 #ifdef NEED_CURL_TIMER_CALLBACK
 /* Called from curl_multi_do_locked, with s->mutex held.  */
@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
     switch (action) {
         case CURL_POLL_IN:
             aio_set_fd_handler(s->aio_context, fd, false,
-                               curl_multi_read, NULL, NULL, state);
+                               curl_multi_do, NULL, NULL, state);
             break;
         case CURL_POLL_OUT:
             aio_set_fd_handler(s->aio_context, fd, false,
@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
             break;
         case CURL_POLL_INOUT:
             aio_set_fd_handler(s->aio_context, fd, false,
-                               curl_multi_read, curl_multi_do, NULL, state);
+                               curl_multi_do, curl_multi_do, NULL, state);
             break;
         case CURL_POLL_REMOVE:
             aio_set_fd_handler(s->aio_context, fd, false,
@@ -XXX,XX +XXX,XX @@ static void curl_multi_do(void *arg)
 {
     CURLState *s = (CURLState *)arg;
 
-    qemu_mutex_lock(&s->s->mutex);
-    curl_multi_do_locked(s);
-    qemu_mutex_unlock(&s->s->mutex);
-}
-
-static void curl_multi_read(void *arg)
-{
-    CURLState *s = (CURLState *)arg;
-
     qemu_mutex_lock(&s->s->mutex);
     curl_multi_do_locked(s);
     curl_multi_check_completion(s->s);
-- 
2.21.0

curl_multi_do_locked() currently marks all sockets as ready.  That is
not only inefficient, but in fact unsafe (the loop is).  A follow-up
patch will change that, but to do so, curl_multi_do_locked() needs to
know exactly which socket is ready; and that is accomplished by this
patch here.

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190910124136.10565-5-mreitz@redhat.com
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/curl.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/block/curl.c b/block/curl.c
index XXXXXXX..XXXXXXX 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -XXX,XX +XXX,XX @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,
     switch (action) {
         case CURL_POLL_IN:
             aio_set_fd_handler(s->aio_context, fd, false,
-                               curl_multi_do, NULL, NULL, state);
+                               curl_multi_do, NULL, NULL, socket);
             break;
         case CURL_POLL_OUT:
             aio_set_fd_handler(s->aio_context, fd, false,
-                               NULL, curl_multi_do, NULL, state);
+                               NULL, curl_multi_do, NULL, socket);
             break;
         case CURL_POLL_INOUT:
             aio_set_fd_handler(s->aio_context, fd, false,
-                               curl_multi_do, curl_multi_do, NULL, state);
+                               curl_multi_do, curl_multi_do, NULL, socket);
             break;
         case CURL_POLL_REMOVE:
             aio_set_fd_handler(s->aio_context, fd, false,
@@ -XXX,XX +XXX,XX @@ static void curl_multi_check_completion(BDRVCURLState *s)
 }
 
 /* Called with s->mutex held.  */
-static void curl_multi_do_locked(CURLState *s)
+static void curl_multi_do_locked(CURLSocket *ready_socket)
 {
     CURLSocket *socket, *next_socket;
+    CURLState *s = ready_socket->state;
     int running;
     int r;
 
@@ -XXX,XX +XXX,XX @@ static void curl_multi_do_locked(CURLState *s)
 
 static void curl_multi_do(void *arg)
 {
-    CURLState *s = (CURLState *)arg;
+    CURLSocket *socket = arg;
+    BDRVCURLState *s = socket->state->s;
 
-    qemu_mutex_lock(&s->s->mutex);
-    curl_multi_do_locked(s);
-    curl_multi_check_completion(s->s);
-    qemu_mutex_unlock(&s->s->mutex);
+    qemu_mutex_lock(&s->mutex);
+    curl_multi_do_locked(socket);
+    curl_multi_check_completion(s);
+    qemu_mutex_unlock(&s->mutex);
 }
 
 static void curl_multi_timeout_do(void *arg)
-- 
2.21.0

Instead of reporting all sockets to cURL, only report the one that has
caused curl_multi_do_locked() to be called.  This lets us get rid of the
QLIST_FOREACH_SAFE() list, which was actually wrong: SAFE foreaches are
only safe when the current element is removed in each iteration.  If it
possible for the list to be concurrently modified, we cannot guarantee
that only the current element will be removed.  Therefore, we must not
use QLIST_FOREACH_SAFE() here.

Fixes: ff5ca1664af85b24a4180d595ea6873fd3deac57
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190910124136.10565-6-mreitz@redhat.com
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/curl.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/block/curl.c b/block/curl.c
index XXXXXXX..XXXXXXX 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -XXX,XX +XXX,XX @@ static void curl_multi_check_completion(BDRVCURLState *s)
 }
 
 /* Called with s->mutex held.  */
-static void curl_multi_do_locked(CURLSocket *ready_socket)
+static void curl_multi_do_locked(CURLSocket *socket)
 {
-    CURLSocket *socket, *next_socket;
-    CURLState *s = ready_socket->state;
+    BDRVCURLState *s = socket->state->s;
     int running;
     int r;
 
-    if (!s->s->multi) {
+    if (!s->multi) {
         return;
     }
 
-    /* Need to use _SAFE because curl_multi_socket_action() may trigger
-     * curl_sock_cb() which might modify this list */
-    QLIST_FOREACH_SAFE(socket, &s->sockets, next, next_socket) {
-        do {
-            r = curl_multi_socket_action(s->s->multi, socket->fd, 0, &running);
-        } while (r == CURLM_CALL_MULTI_PERFORM);
-    }
+    do {
+        r = curl_multi_socket_action(s->multi, socket->fd, 0, &running);
+    } while (r == CURLM_CALL_MULTI_PERFORM);
 }
 
 static void curl_multi_do(void *arg)
-- 
2.21.0

Background: As of cURL 7.59.0, it verifies that several functions are
not called from within a callback.  Among these functions is
curl_multi_add_handle().

curl_read_cb() is a callback from cURL and not a coroutine.  Waking up
acb->co will lead to entering it then and there, which means the current
request will settle and the caller (if it runs in the same coroutine)
may then issue the next request.  In such a case, we will enter
curl_setup_preadv() effectively from within curl_read_cb().

Calling curl_multi_add_handle() will then fail and the new request will
not be processed.

Fix this by not letting curl_read_cb() wake up acb->co.  Instead, leave
the whole business of settling the AIOCB objects to
curl_multi_check_completion() (which is called from our timer callback
and our FD handler, so not from any cURL callbacks).

Reported-by: Natalie Gavrielov <ngavrilo@redhat.com>
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1740193
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190910124136.10565-7-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/curl.c | 69 ++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 40 deletions(-)

diff --git a/block/curl.c b/block/curl.c
index XXXXXXX..XXXXXXX 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -XXX,XX +XXX,XX @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
 {
     CURLState *s = ((CURLState*)opaque);
     size_t realsize = size * nmemb;
-    int i;
 
     trace_curl_read_cb(realsize);
 
@@ -XXX,XX +XXX,XX @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
     memcpy(s->orig_buf + s->buf_off, ptr, realsize);
     s->buf_off += realsize;
 
-    for(i=0; i<CURL_NUM_ACB; i++) {
-        CURLAIOCB *acb = s->acb[i];
-
-        if (!acb)
-            continue;
-
-        if ((s->buf_off >= acb->end)) {
-            size_t request_length = acb->bytes;
-
-            qemu_iovec_from_buf(acb->qiov, 0, s->orig_buf + acb->start,
-                                acb->end - acb->start);
-
-            if (acb->end - acb->start < request_length) {
-                size_t offset = acb->end - acb->start;
-                qemu_iovec_memset(acb->qiov, offset, 0,
-                                  request_length - offset);
-            }
-
-            acb->ret = 0;
-            s->acb[i] = NULL;
-            qemu_mutex_unlock(&s->s->mutex);
-            aio_co_wake(acb->co);
-            qemu_mutex_lock(&s->s->mutex);
-        }
-    }
-
 read_end:
     /* curl will error out if we do not return this value */
     return size * nmemb;
@@ -XXX,XX +XXX,XX @@ static void curl_multi_check_completion(BDRVCURLState *s)
             break;
 
         if (msg->msg == CURLMSG_DONE) {
+            int i;
             CURLState *state = NULL;
+            bool error = msg->data.result != CURLE_OK;
+
             curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE,
                               (char **)&state);
 
-            /* ACBs for successful messages get completed in curl_read_cb */
-            if (msg->data.result != CURLE_OK) {
-                int i;
+            if (error) {
                 static int errcount = 100;
 
                 /* Don't lose the original error message from curl, since
@@ -XXX,XX +XXX,XX @@ static void curl_multi_check_completion(BDRVCURLState *s)
                         error_report("curl: further errors suppressed");
                     }
                 }
+            }
 
-                for (i = 0; i < CURL_NUM_ACB; i++) {
-                    CURLAIOCB *acb = state->acb[i];
+            for (i = 0; i < CURL_NUM_ACB; i++) {
+                CURLAIOCB *acb = state->acb[i];
 
-                    if (acb == NULL) {
-                        continue;
-                    }
+                if (acb == NULL) {
+                    continue;
+                }
+
+                if (!error) {
+                    /* Assert that we have read all data */
+                    assert(state->buf_off >= acb->end);
+
+                    qemu_iovec_from_buf(acb->qiov, 0,
+                                        state->orig_buf + acb->start,
+                                        acb->end - acb->start);
 
-                    acb->ret = -EIO;
-                    state->acb[i] = NULL;
-                    qemu_mutex_unlock(&s->mutex);
-                    aio_co_wake(acb->co);
-                    qemu_mutex_lock(&s->mutex);
+                    if (acb->end - acb->start < acb->bytes) {
+                        size_t offset = acb->end - acb->start;
+                        qemu_iovec_memset(acb->qiov, offset, 0,
+                                          acb->bytes - offset);
+                    }
                 }
+
+                acb->ret = error ? -EIO : 0;
+                state->acb[i] = NULL;
+                qemu_mutex_unlock(&s->mutex);
+                aio_co_wake(acb->co);
+                qemu_mutex_lock(&s->mutex);
             }
 
             curl_clean_state(state);
-- 
2.21.0

If we had done that all along, debugging would have been much simpler.
(Also, I/O errors are better than hangs.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190910124136.10565-8-mreitz@redhat.com
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/curl.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/block/curl.c b/block/curl.c
index XXXXXXX..XXXXXXX 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -XXX,XX +XXX,XX @@ static void curl_setup_preadv(BlockDriverState *bs, CURLAIOCB *acb)
     trace_curl_setup_preadv(acb->bytes, start, state->range);
     curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);
 
-    curl_multi_add_handle(s->multi, state->curl);
+    if (curl_multi_add_handle(s->multi, state->curl) != CURLM_OK) {
+        state->acb[0] = NULL;
+        acb->ret = -EIO;
+
+        curl_clean_state(state);
+        goto out;
+    }
 
     /* Tell curl it needs to kick things off */
     curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
-- 
2.21.0

From: Sergio Lopez <slp@redhat.com>

block_job_remove_all_bdrv() iterates through job->nodes, calling
bdrv_root_unref_child() for each entry. The call to the latter may
reach child_job_[can_]set_aio_ctx(), which will also attempt to
traverse job->nodes, potentially finding entries that where freed
on previous iterations.

To avoid this situation, update job->nodes head on each iteration to
ensure that already freed entries are no longer linked to the list.

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1746631
Signed-off-by: Sergio Lopez <slp@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190911100316.32282-1-mreitz@redhat.com
Reviewed-by: Sergio Lopez <slp@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 blockjob.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/blockjob.c b/blockjob.c
index XXXXXXX..XXXXXXX 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -XXX,XX +XXX,XX @@ static const BdrvChildRole child_job = {
 
 void block_job_remove_all_bdrv(BlockJob *job)
 {
-    GSList *l;
-    for (l = job->nodes; l; l = l->next) {
+    /*
+     * bdrv_root_unref_child() may reach child_job_[can_]set_aio_ctx(),
+     * which will also traverse job->nodes, so consume the list one by
+     * one to make sure that such a concurrent access does not attempt
+     * to process an already freed BdrvChild.
+     */
+    while (job->nodes) {
+        GSList *l = job->nodes;
         BdrvChild *c = l->data;
+
+        job->nodes = l->next;
+
         bdrv_op_unblock_all(c->bs, job->blocker);
         bdrv_root_unref_child(c);
+
+        g_slist_free_1(l);
     }
-    g_slist_free(job->nodes);
-    job->nodes = NULL;
 }
 
 bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs)
-- 
2.21.0

From: Maxim Levitsky <mlevitsk@redhat.com>

This fixes subtle corruption introduced by luks threaded encryption
in commit 8ac0f15f335

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1745922

The corruption happens when we do a write that
   * writes to two or more unallocated clusters at once
   * doesn't fully cover the first sector
   * doesn't fully cover the last sector
   * uses luks encryption

In this case, when allocating the new clusters we COW both areas
prior to the write and after the write, and we encrypt them.

The above mentioned commit accidentally made it so we encrypt the
second COW area using the physical cluster offset of the first area.

The problem is that offset_in_cluster in do_perform_cow_encrypt
can be larger that the cluster size, thus cluster_offset
will no longer point to the start of the cluster at which encrypted
area starts.

Next patch in this series will refactor the code to avoid all these
assumptions.

In the bugreport that was triggered by rebasing a luks image to new,
zero filled base, which lot of such writes, and causes some files
with zero areas to contain garbage there instead.
But as described above it can happen elsewhere as well

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190915203655.21638-2-mlevitsk@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2-cluster.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -XXX,XX +XXX,XX @@ static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs,
         assert(QEMU_IS_ALIGNED(offset_in_cluster, BDRV_SECTOR_SIZE));
         assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
         assert(s->crypto);
-        if (qcow2_co_encrypt(bs, cluster_offset,
-                             src_cluster_offset + offset_in_cluster,
-                             buffer, bytes) < 0) {
+        if (qcow2_co_encrypt(bs,
+                start_of_cluster(s, cluster_offset + offset_in_cluster),
+                src_cluster_offset + offset_in_cluster,
+                buffer, bytes) < 0) {
             return false;
         }
     }
-- 
2.21.0

From: Maxim Levitsky <mlevitsk@redhat.com>

* Change the qcow2_co_{encrypt|decrypt} to just receive full host and
  guest offsets and use this function directly instead of calling
  do_perform_cow_encrypt (which is removed by that patch).

* Adjust qcow2_co_encdec to take full host and guest offsets as well.

* Document the qcow2_co_{encrypt|decrypt} arguments
  to prevent the bug fixed in former commit from hopefully
  happening again.

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20190915203655.21638-3-mlevitsk@redhat.com
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
[mreitz: Let perform_cow() return the error value returned by
         qcow2_co_encrypt(), as proposed by Vladimir]
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.h         |  8 +++---
 block/qcow2-cluster.c | 41 +++++++++-------------------
 block/qcow2-threads.c | 63 +++++++++++++++++++++++++++++++++----------
 block/qcow2.c         |  5 ++--
 4 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/block/qcow2.h b/block/qcow2.h
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -XXX,XX +XXX,XX @@ ssize_t coroutine_fn
 qcow2_co_decompress(BlockDriverState *bs, void *dest, size_t dest_size,
                     const void *src, size_t src_size);
 int coroutine_fn
-qcow2_co_encrypt(BlockDriverState *bs, uint64_t file_cluster_offset,
-                 uint64_t offset, void *buf, size_t len);
+qcow2_co_encrypt(BlockDriverState *bs, uint64_t host_offset,
+                 uint64_t guest_offset, void *buf, size_t len);
 int coroutine_fn
-qcow2_co_decrypt(BlockDriverState *bs, uint64_t file_cluster_offset,
-                 uint64_t offset, void *buf, size_t len);
+qcow2_co_decrypt(BlockDriverState *bs, uint64_t host_offset,
+                 uint64_t guest_offset, void *buf, size_t len);
 
 #endif
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn do_perform_cow_read(BlockDriverState *bs,
     return 0;
 }
 
-static bool coroutine_fn do_perform_cow_encrypt(BlockDriverState *bs,
-                                                uint64_t src_cluster_offset,
-                                                uint64_t cluster_offset,
-                                                unsigned offset_in_cluster,
-                                                uint8_t *buffer,
-                                                unsigned bytes)
-{
-    if (bytes && bs->encrypted) {
-        BDRVQcow2State *s = bs->opaque;
-        assert(QEMU_IS_ALIGNED(offset_in_cluster, BDRV_SECTOR_SIZE));
-        assert(QEMU_IS_ALIGNED(bytes, BDRV_SECTOR_SIZE));
-        assert(s->crypto);
-        if (qcow2_co_encrypt(bs,
-                start_of_cluster(s, cluster_offset + offset_in_cluster),
-                src_cluster_offset + offset_in_cluster,
-                buffer, bytes) < 0) {
-            return false;
-        }
-    }
-    return true;
-}
-
 static int coroutine_fn do_perform_cow_write(BlockDriverState *bs,
                                              uint64_t cluster_offset,
                                              unsigned offset_in_cluster,
@@ -XXX,XX +XXX,XX @@ static int perform_cow(BlockDriverState *bs, QCowL2Meta *m)
 
     /* Encrypt the data if necessary before writing it */
     if (bs->encrypted) {
-        if (!do_perform_cow_encrypt(bs, m->offset, m->alloc_offset,
-                                    start->offset, start_buffer,
-                                    start->nb_bytes) ||
-            !do_perform_cow_encrypt(bs, m->offset, m->alloc_offset,
-                                    end->offset, end_buffer, end->nb_bytes)) {
-            ret = -EIO;
+        ret = qcow2_co_encrypt(bs,
+                               m->alloc_offset + start->offset,
+                               m->offset + start->offset,
+                               start_buffer, start->nb_bytes);
+        if (ret < 0) {
+            goto fail;
+        }
+
+        ret = qcow2_co_encrypt(bs,
+                               m->alloc_offset + end->offset,
+                               m->offset + end->offset,
+                               end_buffer, end->nb_bytes);
+        if (ret < 0) {
             goto fail;
         }
     }
diff --git a/block/qcow2-threads.c b/block/qcow2-threads.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2-threads.c
+++ b/block/qcow2-threads.c
@@ -XXX,XX +XXX,XX @@ static int qcow2_encdec_pool_func(void *opaque)
 }
 
 static int coroutine_fn
-qcow2_co_encdec(BlockDriverState *bs, uint64_t file_cluster_offset,
-                  uint64_t offset, void *buf, size_t len, Qcow2EncDecFunc func)
+qcow2_co_encdec(BlockDriverState *bs, uint64_t host_offset,
+                uint64_t guest_offset, void *buf, size_t len,
+                Qcow2EncDecFunc func)
 {
     BDRVQcow2State *s = bs->opaque;
     Qcow2EncDecData arg = {
         .block = s->crypto,
-        .offset = s->crypt_physical_offset ?
-                      file_cluster_offset + offset_into_cluster(s, offset) :
-                      offset,
+        .offset = s->crypt_physical_offset ? host_offset : guest_offset,
         .buf = buf,
         .len = len,
         .func = func,
     };
 
-    return qcow2_co_process(bs, qcow2_encdec_pool_func, &arg);
+    assert(QEMU_IS_ALIGNED(guest_offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(host_offset, BDRV_SECTOR_SIZE));
+    assert(QEMU_IS_ALIGNED(len, BDRV_SECTOR_SIZE));
+    assert(s->crypto);
+
+    return len == 0 ? 0 : qcow2_co_process(bs, qcow2_encdec_pool_func, &arg);
 }
 
+/*
+ * qcow2_co_encrypt()
+ *
+ * Encrypts one or more contiguous aligned sectors
+ *
+ * @host_offset - underlying storage offset of the first sector of the
+ * data to be encrypted
+ *
+ * @guest_offset - guest (virtual) offset of the first sector of the
+ * data to be encrypted
+ *
+ * @buf - buffer with the data to encrypt, that after encryption
+ *        will be written to the underlying storage device at
+ *        @host_offset
+ *
+ * @len - length of the buffer (must be a BDRV_SECTOR_SIZE multiple)
+ *
+ * Depending on the encryption method, @host_offset and/or @guest_offset
+ * may be used for generating the initialization vector for
+ * encryption.
+ *
+ * Note that while the whole range must be aligned on sectors, it
+ * does not have to be aligned on clusters and can also cross cluster
+ * boundaries
+ */
 int coroutine_fn
-qcow2_co_encrypt(BlockDriverState *bs, uint64_t file_cluster_offset,
-                 uint64_t offset, void *buf, size_t len)
+qcow2_co_encrypt(BlockDriverState *bs, uint64_t host_offset,
+                 uint64_t guest_offset, void *buf, size_t len)
 {
-    return qcow2_co_encdec(bs, file_cluster_offset, offset, buf, len,
-                             qcrypto_block_encrypt);
+    return qcow2_co_encdec(bs, host_offset, guest_offset, buf, len,
+                           qcrypto_block_encrypt);
 }
 
+/*
+ * qcow2_co_decrypt()
+ *
+ * Decrypts one or more contiguous aligned sectors
+ * Similar to qcow2_co_encrypt
+ */
 int coroutine_fn
-qcow2_co_decrypt(BlockDriverState *bs, uint64_t file_cluster_offset,
-                 uint64_t offset, void *buf, size_t len)
+qcow2_co_decrypt(BlockDriverState *bs, uint64_t host_offset,
+                 uint64_t guest_offset, void *buf, size_t len)
 {
-    return qcow2_co_encdec(bs, file_cluster_offset, offset, buf, len,
-                             qcrypto_block_decrypt);
+    return qcow2_co_encdec(bs, host_offset, guest_offset, buf, len,
+                           qcrypto_block_decrypt);
 }
diff --git a/block/qcow2.c b/block/qcow2.c
index XXXXXXX..XXXXXXX 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_preadv_part(BlockDriverState *bs,
 
                 assert(QEMU_IS_ALIGNED(offset, BDRV_SECTOR_SIZE));
                 assert(QEMU_IS_ALIGNED(cur_bytes, BDRV_SECTOR_SIZE));
-                if (qcow2_co_decrypt(bs, cluster_offset, offset,
+                if (qcow2_co_decrypt(bs, cluster_offset + offset_in_cluster,
+                                     offset,
                                      cluster_data, cur_bytes) < 0) {
                     ret = -EIO;
                     goto fail;
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow2_co_pwritev_part(
             qemu_iovec_to_buf(qiov, qiov_offset + bytes_done,
                               cluster_data, cur_bytes);
 
-            if (qcow2_co_encrypt(bs, cluster_offset, offset,
+            if (qcow2_co_encrypt(bs, cluster_offset + offset_in_cluster, offset,
                                  cluster_data, cur_bytes) < 0) {
                 ret = -EIO;
                 goto out_unlocked;
-- 
2.21.0

From: Maxim Levitsky <mlevitsk@redhat.com>

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20190915203655.21638-4-mlevitsk@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/263     | 91 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/263.out | 40 +++++++++++++++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 132 insertions(+)
 create mode 100755 tests/qemu-iotests/263
 create mode 100644 tests/qemu-iotests/263.out

diff --git a/tests/qemu-iotests/263 b/tests/qemu-iotests/263
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/263
@@ -XXX,XX +XXX,XX @@
+#!/usr/bin/env bash
+#
+# Test encrypted write that crosses cluster boundary of two unallocated clusters
+# Based on 188
+#
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+# creator
+owner=mlevitsk@redhat.com
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+status=1	# failure is the default!
+
+_cleanup()
+{
+	_cleanup_test_img
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_supported_fmt qcow2
+_supported_proto generic
+_supported_os Linux
+
+
+size=1M
+
+SECRET="secret,id=sec0,data=astrochicken"
+QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT
+
+
+_run_test()
+{
+	echo "== reading the whole image =="
+	$QEMU_IO --object $SECRET -c "read -P 0 0 $size" --image-opts "$1" | _filter_qemu_io | _filter_testdir
+
+	echo
+	echo "== write two 512 byte sectors on a cluster boundary =="
+	$QEMU_IO --object $SECRET -c "write -P 0xAA 0xFE00 0x400" --image-opts "$1" | _filter_qemu_io | _filter_testdir
+
+	echo
+	echo "== verify that the rest of the image is not changed =="
+	$QEMU_IO --object $SECRET -c "read -P 0x00 0x00000 0xFE00" --image-opts "$1" | _filter_qemu_io | _filter_testdir
+	$QEMU_IO --object $SECRET -c "read -P 0xAA 0x0FE00 0x400" --image-opts "$1" | _filter_qemu_io | _filter_testdir
+	$QEMU_IO --object $SECRET -c "read -P 0x00 0x10200 0xEFE00" --image-opts "$1" | _filter_qemu_io | _filter_testdir
+
+}
+
+
+echo
+echo "testing LUKS qcow2 encryption"
+echo
+
+_make_test_img --object $SECRET -o "encrypt.format=luks,encrypt.key-secret=sec0,encrypt.iter-time=10,cluster_size=64K" $size
+_run_test "driver=$IMGFMT,encrypt.key-secret=sec0,file.filename=$TEST_IMG"
+_cleanup_test_img
+
+echo
+echo "testing legacy AES qcow2 encryption"
+echo
+
+
+_make_test_img --object $SECRET -o "encrypt.format=aes,encrypt.key-secret=sec0,cluster_size=64K" $size
+_run_test "driver=$IMGFMT,encrypt.key-secret=sec0,file.filename=$TEST_IMG"
+_cleanup_test_img
+
+
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/263.out b/tests/qemu-iotests/263.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/263.out
@@ -XXX,XX +XXX,XX @@
+QA output created by 263
+
+testing LUKS qcow2 encryption
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
+== reading the whole image ==
+read 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+== write two 512 byte sectors on a cluster boundary ==
+wrote 1024/1024 bytes at offset 65024
+1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+== verify that the rest of the image is not changed ==
+read 65024/65024 bytes at offset 0
+63.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 1024/1024 bytes at offset 65024
+1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 982528/982528 bytes at offset 66048
+959.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+testing legacy AES qcow2 encryption
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=aes encrypt.key-secret=sec0
+== reading the whole image ==
+read 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+== write two 512 byte sectors on a cluster boundary ==
+wrote 1024/1024 bytes at offset 65024
+1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+== verify that the rest of the image is not changed ==
+read 65024/65024 bytes at offset 0
+63.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 1024/1024 bytes at offset 65024
+1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+read 982528/982528 bytes at offset 66048
+959.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -XXX,XX +XXX,XX @@
 257 rw
 258 rw quick
 262 rw quick migration
+263 rw quick
 265 rw auto quick
 266 rw quick
-- 
2.21.0