Series comparison

-[Qemu-devel] [PULL 00/15] Block layer patches
+[PULL v2 0/4] Block layer patches
-The following changes since commit 9964e96dc9999cf7f7c936ee854a795415d19b60:
+The following changes since commit 7f21573c822805a8e6be379d9bcf3ad9effef3dc:
-  Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging (2017-05-23 15:01:31 +0100)
+  Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-10-01' into staging (2019-10-01 13:13:38 +0100)
-are available in the git repository at:
+are available in the Git repository at:
   git://repo.or.cz/qemu/kevin.git tags/for-upstream
-for you to fetch changes up to 42a48128417b3bfade93d1a4721348cc480e9e50:
+for you to fetch changes up to 352492e5541e293ea8117412ffd171ce1c7ac15d:
-  Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block (2017-05-29 16:34:27 +0200)
+  iotests: Remove Python 2 compatibility code (2019-10-02 16:47:23 +0200)
 ----------------------------------------------------------------
+Block layer patches:
-Block layer patches
+- Fix internal snapshots with typical -blockdev setups
 - iotests: Require Python 3.6 or later
 ----------------------------------------------------------------
-Alberto Garcia (2):
+Kevin Wolf (4):
-      stream: fix crash in stream_start() when block_job_create() fails
+      block/snapshot: Restrict set of snapshot nodes
-      qcow2: remove extra local_error variable
+      iotests: Test internal snapshots with -blockdev
       iotests: Require Python 3.6 or later
       iotests: Remove Python 2 compatibility code
-Daniel P. Berrange (4):
+ block/snapshot.c                 |  26 ++++--
-      qemu-img: add support for --object with 'dd' command
+ tests/qemu-iotests/044           |   3 -
-      qemu-img: fix --image-opts usage with dd command
+ tests/qemu-iotests/163           |   3 -
-      qemu-img: introduce --target-image-opts for 'convert' command
+ tests/qemu-iotests/267           | 168 ++++++++++++++++++++++++++++++++++++
-      qemu-img: copy *key-secret opts when opening newly created files
+ tests/qemu-iotests/267.out       | 182 +++++++++++++++++++++++++++++++++++++++
  tests/qemu-iotests/check         |  13 ++-
  tests/qemu-iotests/common.filter |  11 ++-
  tests/qemu-iotests/group         |   1 +
  tests/qemu-iotests/iotests.py    |  13 +--
 files changed, 392 insertions(+), 28 deletions(-)
  create mode 100755 tests/qemu-iotests/267
  create mode 100644 tests/qemu-iotests/267.out
-Eric Blake (1):
-      block: Tweak error message related to qemu-img amend
-Fam Zheng (3):
-      iotests: 147: Don't test inet6 if not available
-      qemu-img: Fix documentation of convert
-      qemu-img: Fix leakage of options on error
-Kevin Wolf (3):
-      qemu-iotests: Test streaming with missing job ID
-      mirror: Drop permissions on s->target on completion
-      Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block
-Max Reitz (2):
-      block: Fix backing paths for filenames with colons
-      block/file-*: *_parse_filename() and colons
-Stephen Bates (1):
-      nvme: Add support for Controller Memory Buffers
- block.c                    |  50 +++++++++++++--
- block/file-posix.c         |  17 +-----
- block/file-win32.c         |  12 +---
- block/mirror.c             |   7 ++-
- block/qcow2-cluster.c      |   3 +-
- block/qcow2.c              |   5 +-
- block/stream.c             |   2 +-
- hw/block/nvme.c            |  75 +++++++++++++++++++++--
- hw/block/nvme.h            |  73 ++++++++++++++++++++++
- include/block/block_int.h  |   3 +
- qemu-img-cmds.hx           |   4 +-
- qemu-img.c                 | 148 +++++++++++++++++++++++++++++++++++----------
- qemu-img.texi              |  12 +++-
- tests/qemu-iotests/030     |   4 ++
- tests/qemu-iotests/030.out |   4 +-
- tests/qemu-iotests/060.out |   2 +-
- tests/qemu-iotests/147     |   7 +++
-files changed, 351 insertions(+), 77 deletions(-)

-[Qemu-devel] [PULL 01/15] stream: fix crash in stream_start() when block_job_create() fails
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-The code that tries to reopen a BlockDriverState in stream_start()
-when the creation of a new block job fails crashes because it attempts
-to dereference a pointer that is known to be NULL.
-This is a regression introduced in a170a91fd3eab6155da39e740381867e,
-likely because the code was copied from stream_complete().
-Cc: qemu-stable@nongnu.org
-Reported-by: Kashyap Chamarthy <kchamart@redhat.com>
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Tested-by: Kashyap Chamarthy <kchamart@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/stream.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/block/stream.c b/block/stream.c
-index XXXXXXX..XXXXXXX 100644
---- a/block/stream.c
-+++ b/block/stream.c
-@@ -XXX,XX +XXX,XX @@ void stream_start(const char *job_id, BlockDriverState *bs,
- fail:
-     if (orig_bs_flags != bdrv_get_flags(bs)) {
--        bdrv_reopen(bs, s->bs_flags, NULL);
-+        bdrv_reopen(bs, orig_bs_flags, NULL);
-     }
- }
---
-.8.3.1

-[Qemu-devel] [PULL 05/15] mirror: Drop permissions on s->target on completion
+[PULL v2 1/4] block/snapshot: Restrict set of snapshot nodes
-This fixes an assertion failure that was triggered by qemu-iotests 129
+Nodes involved in internal snapshots were those that were returned by
-on some CI host, while the same test case didn't seem to fail on other
+bdrv_next(), inserted and not read-only. bdrv_next() in turn returns all
-hosts.
+nodes that are either the root node of a BlockBackend or monitor-owned
 nodes.
-Essentially the problem is that the blk_unref(s->target) in
+With the typical -drive use, this worked well enough. However, in the
-mirror_exit() doesn't necessarily mean that the BlockBackend goes away
+typical -blockdev case, the user defines one node per option, making all
-immediately. It is possible that the job completion was triggered nested
+nodes monitor-owned nodes. This includes protocol nodes etc. which often
-in mirror_drain(), which looks like this:
+are not snapshottable, so "savevm" only returns an error.
-    BlockBackend *target = s->target;
+Change the conditions so that internal snapshot still include all nodes
-    blk_ref(target);
+that have a BlockBackend attached (we definitely want to snapshot
-    blk_drain(target);
+anything attached to a guest device and probably also the built-in NBD
-    blk_unref(target);
+server; snapshotting block job BlockBackends is more of an accident, but
 a preexisting one), but other monitor-owned nodes are only included if
 they have no parents.
-In this case, the write permissions for s->target are retained until
+This makes internal snapshots usable again with typical -blockdev
-after blk_drain(), which makes removing mirror_top_bs fail for the
+configurations.
 active commit case (can't have a writable backing file in the chain
 without the filter driver).
 Explicitly dropping the permissions first means that the additional
 reference doesn't hurt and the job can complete successfully even if
 called from the nested blk_drain().
 Cc: qemu-stable@nongnu.org
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
 Tested-by: Peter Krempa <pkrempa@redhat.com>
 ---
- block/mirror.c | 7 ++++++-
+ block/snapshot.c | 26 +++++++++++++++++++-------
-file changed, 6 insertions(+), 1 deletion(-)
+file changed, 19 insertions(+), 7 deletions(-)
-diff --git a/block/mirror.c b/block/mirror.c
+diff --git a/block/snapshot.c b/block/snapshot.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/mirror.c
+--- a/block/snapshot.c
-+++ b/block/mirror.c
++++ b/block/snapshot.c
-@@ -XXX,XX +XXX,XX @@ static void mirror_exit(BlockJob *job, void *opaque)
+@@ -XXX,XX +XXX,XX @@
+ #include "qapi/qmp/qerror.h"
-     /* Remove target parent that still uses BLK_PERM_WRITE/RESIZE before
+ #include "qapi/qmp/qstring.h"
-      * inserting target_bs at s->to_replace, where we might not be able to get
+ #include "qemu/option.h"
--     * these permissions. */
++#include "sysemu/block-backend.h"
-+     * these permissions.
-+     *
+ QemuOptsList internal_snapshot_opts = {
-+     * Note that blk_unref() alone doesn't necessarily drop permissions because
+     .name = "snapshot",
-+     * we might be running nested inside mirror_drain(), which takes an extra
+@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,
-+     * reference, so use an explicit blk_set_perm() first. */
+     return ret;
-+    blk_set_perm(s->target, 0, BLK_PERM_ALL, &error_abort);
+ }
-     blk_unref(s->target);
-     s->target = NULL;
++static bool bdrv_all_snapshots_includes_bs(BlockDriverState *bs)
++{
 +    if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
 +        return false;
 +    }
 +
 +    /* Include all nodes that are either in use by a BlockBackend, or that
 +     * aren't attached to any node, but owned by the monitor. */
 +    return bdrv_has_blk(bs) || QLIST_EMPTY(&bs->parents);
 +}
  /* Group operations. All block drivers are involved.
   * These functions will properly handle dataplane (take aio_context_acquire
@@ -XXX,XX +XXX,XX @@ bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs)
          AioContext *ctx = bdrv_get_aio_context(bs);
          aio_context_acquire(ctx);
 -        if (bdrv_is_inserted(bs) && !bdrv_is_read_only(bs)) {
 +        if (bdrv_all_snapshots_includes_bs(bs)) {
              ok = bdrv_can_snapshot(bs);
          }
          aio_context_release(ctx);
@@ -XXX,XX +XXX,XX @@ int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs,
          AioContext *ctx = bdrv_get_aio_context(bs);
          aio_context_acquire(ctx);
 -        if (bdrv_can_snapshot(bs) &&
 -                bdrv_snapshot_find(bs, snapshot, name) >= 0) {
 +        if (bdrv_all_snapshots_includes_bs(bs) &&
 +            bdrv_snapshot_find(bs, snapshot, name) >= 0)
 +        {
              ret = bdrv_snapshot_delete(bs, snapshot->id_str,
                                         snapshot->name, err);
          }
@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs,
          AioContext *ctx = bdrv_get_aio_context(bs);
          aio_context_acquire(ctx);
 -        if (bdrv_can_snapshot(bs)) {
 +        if (bdrv_all_snapshots_includes_bs(bs)) {
              ret = bdrv_snapshot_goto(bs, name, errp);
          }
          aio_context_release(ctx);
@@ -XXX,XX +XXX,XX @@ int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs)
          AioContext *ctx = bdrv_get_aio_context(bs);
          aio_context_acquire(ctx);
 -        if (bdrv_can_snapshot(bs)) {
 +        if (bdrv_all_snapshots_includes_bs(bs)) {
              err = bdrv_snapshot_find(bs, &sn, name);
          }
          aio_context_release(ctx);
@@ -XXX,XX +XXX,XX @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
          if (bs == vm_state_bs) {
              sn->vm_state_size = vm_state_size;
              err = bdrv_snapshot_create(bs, sn);
 -        } else if (bdrv_can_snapshot(bs)) {
 +        } else if (bdrv_all_snapshots_includes_bs(bs)) {
              sn->vm_state_size = 0;
              err = bdrv_snapshot_create(bs, sn);
          }
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_all_find_vmstate_bs(void)
          bool found;
          aio_context_acquire(ctx);
 -        found = bdrv_can_snapshot(bs);
 +        found = bdrv_all_snapshots_includes_bs(bs) && bdrv_can_snapshot(bs);
          aio_context_release(ctx);
          if (found) {
 --
-.8.3.1
+.20.1

-[Qemu-devel] [PULL 15/15] block/file-*: *_parse_filename() and colons
+[PULL v2 2/4] iotests: Test internal snapshots with -blockdev
-From: Max Reitz <mreitz@redhat.com>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 Reviewed-by: Peter Krempa <pkrempa@redhat.com>
 Tested-by: Peter Krempa <pkrempa@redhat.com>
 ---
  tests/qemu-iotests/267           | 168 ++++++++++++++++++++++++++++
  tests/qemu-iotests/267.out       | 182 +++++++++++++++++++++++++++++++
  tests/qemu-iotests/common.filter |  11 +-
  tests/qemu-iotests/group         |   1 +
 files changed, 358 insertions(+), 4 deletions(-)
  create mode 100755 tests/qemu-iotests/267
  create mode 100644 tests/qemu-iotests/267.out
-The file drivers' *_parse_filename() implementations just strip the
+diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
-optional protocol prefix off the filename. However, for e.g.
+new file mode 100755
-"file:foo:bar", this would lead to "foo:bar" being stored as the BDS's
+index XXXXXXX..XXXXXXX
-filename which looks like it should be managed using the "foo" protocol.
+--- /dev/null
-This is especially troublesome if you then try to resolve a backing
++++ b/tests/qemu-iotests/267
-filename based on "foo:bar".
+@@ -XXX,XX +XXX,XX @@
++#!/usr/bin/env bash
-This issue can only occur if the stripped part is a relative filename
++#
-("file:/foo:bar" will be shortened to "/foo:bar" and having a slash
++# Test which nodes are involved in internal snapshots
-before the first colon means that "/foo" is not recognized as a protocol
++#
-part). Therefore, we can easily fix it by prepending "./" to such
++# Copyright (C) 2019 Red Hat, Inc.
-filenames.
++#
++# This program is free software; you can redistribute it and/or modify
-Before this patch:
++# it under the terms of the GNU General Public License as published by
-$ ./qemu-img create -f qcow2 backing.qcow2 64M
++# the Free Software Foundation; either version 2 of the License, or
-Formatting 'backing.qcow2', fmt=qcow2 size=67108864 encryption=off
++# (at your option) any later version.
-    cluster_size=65536 lazy_refcounts=off refcount_bits=16
++#
-$ ./qemu-img create -f qcow2 -b backing.qcow2 file:top:image.qcow2
++# This program is distributed in the hope that it will be useful,
-Formatting 'file:top:image.qcow2', fmt=qcow2 size=67108864
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
-    backing_file=backing.qcow2 encryption=off cluster_size=65536
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    lazy_refcounts=off refcount_bits=16
++# GNU General Public License for more details.
-$ ./qemu-io file:top:image.qcow2
++#
-can't open device file:top:image.qcow2: Could not open backing file:
++# You should have received a copy of the GNU General Public License
-    Unknown protocol 'top'
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
-After this patch:
++
-$ ./qemu-io file:top:image.qcow2
++# creator
-[no error]
++owner=kwolf@redhat.com
++
-Signed-off-by: Max Reitz <mreitz@redhat.com>
++seq=`basename $0`
-Message-id: 20170522195217.12991-3-mreitz@redhat.com
++echo "QA output created by $seq"
-Reviewed-by: Eric Blake <eblake@redhat.com>
++
-Signed-off-by: Max Reitz <mreitz@redhat.com>
++status=1    # failure is the default!
----
++
- block.c                   | 35 +++++++++++++++++++++++++++++++++++
++_cleanup()
- block/file-posix.c        | 17 +++--------------
++{
- block/file-win32.c        | 12 ++----------
++    _cleanup_test_img
- include/block/block_int.h |  3 +++
++    rm -f "$TEST_DIR/nbd"
-files changed, 43 insertions(+), 24 deletions(-)
++}
++trap "_cleanup; exit \$status" 0 1 2 3 15
-diff --git a/block.c b/block.c
++
 +# get standard environment, filters and checks
 +. ./common.rc
 +. ./common.filter
 +
 +_supported_fmt qcow2
 +_supported_proto file
 +_supported_os Linux
 +
 +# Internal snapshots are (currently) impossible with refcount_bits=1
 +_unsupported_imgopts 'refcount_bits=1[^0-9]'
 +
 +do_run_qemu()
 +{
 +    echo Testing: "$@"
 +    (
 +        if ! test -t 0; then
 +            while read cmd; do
 +                echo $cmd
 +            done
 +        fi
 +        echo quit
 +    ) | $QEMU -nographic -monitor stdio -nodefaults "$@"
 +    echo
 +}
 +
 +run_qemu()
 +{
 +    do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp |
 +        _filter_generated_node_ids | _filter_imgfmt | _filter_vmstate_size
 +}
 +
 +size=128M
 +
 +run_test()
 +{
 +    _make_test_img $size
 +    printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
 +}
 +
 +
 +echo
 +echo "=== No block devices at all ==="
 +echo
 +
 +run_test
 +
 +echo
 +echo "=== -drive if=none ==="
 +echo
 +
 +run_test -drive driver=file,file="$TEST_IMG",if=none
 +run_test -drive driver=$IMGFMT,file="$TEST_IMG",if=none
 +run_test -drive driver=$IMGFMT,file="$TEST_IMG",if=none -device virtio-blk,drive=none0
 +
 +echo
 +echo "=== -drive if=virtio ==="
 +echo
 +
 +run_test -drive driver=file,file="$TEST_IMG",if=virtio
 +run_test -drive driver=$IMGFMT,file="$TEST_IMG",if=virtio
 +
 +echo
 +echo "=== Simple -blockdev ==="
 +echo
 +
 +run_test -blockdev driver=file,filename="$TEST_IMG",node-name=file
 +run_test -blockdev driver=file,filename="$TEST_IMG",node-name=file \
 +         -blockdev driver=$IMGFMT,file=file,node-name=fmt
 +run_test -blockdev driver=file,filename="$TEST_IMG",node-name=file \
 +         -blockdev driver=raw,file=file,node-name=raw \
 +         -blockdev driver=$IMGFMT,file=raw,node-name=fmt
 +
 +echo
 +echo "=== -blockdev with a filter on top ==="
 +echo
 +
 +run_test -blockdev driver=file,filename="$TEST_IMG",node-name=file \
 +         -blockdev driver=$IMGFMT,file=file,node-name=fmt \
 +         -blockdev driver=copy-on-read,file=fmt,node-name=filter
 +
 +echo
 +echo "=== -blockdev with a backing file ==="
 +echo
 +
 +TEST_IMG="$TEST_IMG.base" _make_test_img $size
 +
 +IMGOPTS="backing_file=$TEST_IMG.base" \
 +run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
 +         -blockdev driver=file,filename="$TEST_IMG",node-name=file \
 +         -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
 +
 +IMGOPTS="backing_file=$TEST_IMG.base" \
 +run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
 +         -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
 +         -blockdev driver=file,filename="$TEST_IMG",node-name=file \
 +         -blockdev driver=$IMGFMT,file=file,backing=backing-fmt,node-name=fmt
 +
 +# A snapshot should be present on the overlay, but not the backing file
 +echo Internal snapshots on overlay:
 +$QEMU_IMG snapshot -l "$TEST_IMG" | _filter_date | _filter_vmstate_size
 +
 +echo Internal snapshots on backing file:
 +$QEMU_IMG snapshot -l "$TEST_IMG.base" | _filter_date | _filter_vmstate_size
 +
 +echo
 +echo "=== -blockdev with NBD server on the backing file ==="
 +echo
 +
 +IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
 +cat <<EOF |
 +nbd_server_start unix:$TEST_DIR/nbd
 +nbd_server_add -w backing-fmt
 +savevm snap0
 +info snapshots
 +loadvm snap0
 +EOF
 +run_qemu -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
 +         -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
 +         -blockdev driver=file,filename="$TEST_IMG",node-name=file \
 +         -blockdev driver=$IMGFMT,file=file,backing=backing-fmt,node-name=fmt |
 +         _filter_date
 +
 +# This time, a snapshot should be created on both files
 +echo Internal snapshots on overlay:
 +$QEMU_IMG snapshot -l "$TEST_IMG" | _filter_date | _filter_vmstate_size
 +
 +echo Internal snapshots on backing file:
 +$QEMU_IMG snapshot -l "$TEST_IMG.base" | _filter_date | _filter_vmstate_size
 +
 +# success, all done
 +echo "*** done"
 +rm -f $seq.full
 +status=0
 diff --git a/tests/qemu-iotests/267.out b/tests/qemu-iotests/267.out
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/tests/qemu-iotests/267.out
@@ -XXX,XX +XXX,XX @@
 +QA output created by 267
 +
 +=== No block devices at all ===
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing:
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +Error: No block device can accept snapshots
 +(qemu) info snapshots
 +No available block device supports snapshots
 +(qemu) loadvm snap0
 +Error: No block device supports snapshots
 +(qemu) quit
 +
 +
 +=== -drive if=none ===
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +Error: Device 'none0' is writable but does not support snapshots
 +(qemu) info snapshots
 +No available block device supports snapshots
 +(qemu) loadvm snap0
 +Error: Device 'none0' is writable but does not support snapshots
 +(qemu) quit
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=none
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=none -device virtio-blk,drive=none0
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +
 +=== -drive if=virtio ===
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=virtio
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +Error: Device 'virtio0' is writable but does not support snapshots
 +(qemu) info snapshots
 +No available block device supports snapshots
 +(qemu) loadvm snap0
 +Error: Device 'virtio0' is writable but does not support snapshots
 +(qemu) quit
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=virtio
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +
 +=== Simple -blockdev ===
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +Error: Device '' is writable but does not support snapshots
 +(qemu) info snapshots
 +No available block device supports snapshots
 +(qemu) loadvm snap0
 +Error: Device '' is writable but does not support snapshots
 +(qemu) quit
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,node-name=fmt
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=raw,file=file,node-name=raw -blockdev driver=IMGFMT,file=raw,node-name=fmt
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +
 +=== -blockdev with a filter on top ===
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 +Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,node-name=fmt -blockdev driver=copy-on-read,file=fmt,node-name=filter
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +
 +=== -blockdev with a backing file ===
 +
 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base
 +Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-file,node-name=fmt
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base
 +Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +Internal snapshots on overlay:
 +Snapshot list:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +1         snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +Internal snapshots on backing file:
 +
 +=== -blockdev with NBD server on the backing file ===
 +
 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base
 +Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
 +QEMU X.Y.Z monitor - type 'help' for more information
 +(qemu) nbd_server_start unix:TEST_DIR/nbd
 +(qemu) nbd_server_add -w backing-fmt
 +(qemu) savevm snap0
 +(qemu) info snapshots
 +List of snapshots present on all disks:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +(qemu) loadvm snap0
 +(qemu) quit
 +
 +Internal snapshots on overlay:
 +Snapshot list:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +1         snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +Internal snapshots on backing file:
 +Snapshot list:
 +ID        TAG                 VM SIZE                DATE       VM CLOCK
 +1         snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
 +*** done
 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/tests/qemu-iotests/common.filter
-+++ b/block.c
++++ b/tests/qemu-iotests/common.filter
-@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
+@@ -XXX,XX +XXX,XX @@
-     }
+ # standard filters
  #
 -# ctime(3) dates
 -#
  _filter_date()
  {
 -    $SED \
 -        -e 's/[A-Z][a-z][a-z] [A-z][a-z][a-z]  *[0-9][0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]$/DATE/'
 +    $SED -re 's/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/yyyy-mm-dd hh:mm:ss/'
 +}
 +
 +_filter_vmstate_size()
 +{
 +    $SED -re 's/[0-9. ]{5} [KMGT]iB/     SIZE/' \
 +         -re 's/[0-9. ]{5} B/   SIZE/'
  }
-+/*
+ _filter_generated_node_ids()
-+ * Helper function for bdrv_parse_filename() implementations to remove optional
+diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
 + * protocol prefixes (especially "file:") from a filename and for putting the
 + * stripped filename into the options QDict if there is such a prefix.
 + */
 +void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,
 +                                      QDict *options)
 +{
 +    if (strstart(filename, prefix, &filename)) {
 +        /* Stripping the explicit protocol prefix may result in a protocol
 +         * prefix being (wrongly) detected (if the filename contains a colon) */
 +        if (path_has_protocol(filename)) {
 +            QString *fat_filename;
 +
 +            /* This means there is some colon before the first slash; therefore,
 +             * this cannot be an absolute path */
 +            assert(!path_is_absolute(filename));
 +
 +            /* And we can thus fix the protocol detection issue by prefixing it
 +             * by "./" */
 +            fat_filename = qstring_from_str("./");
 +            qstring_append(fat_filename, filename);
 +
 +            assert(!path_has_protocol(qstring_get_str(fat_filename)));
 +
 +            qdict_put(options, "filename", fat_filename);
 +        } else {
 +            /* If no protocol prefix was detected, we can use the shortened
 +             * filename as-is */
 +            qdict_put_str(options, "filename", filename);
 +        }
 +    }
 +}
 +
 +
  /* Returns whether the image file is opened as read-only. Note that this can
   * return false and writing to the image file is still not possible because the
   * image is inactivated. */
 diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/file-posix.c
+--- a/tests/qemu-iotests/group
-+++ b/block/file-posix.c
++++ b/tests/qemu-iotests/group
-@@ -XXX,XX +XXX,XX @@ static void raw_parse_flags(int bdrv_flags, int *open_flags)
+@@ -XXX,XX +XXX,XX @@
- static void raw_parse_filename(const char *filename, QDict *options,
+rw quick
-                                Error **errp)
+rw auto quick
- {
+rw quick
--    /* The filename does not have to be prefixed by the protocol name, since
++267 rw auto quick snapshot
 -     * "file" is the default protocol; therefore, the return value of this
 -     * function call can be ignored. */
 -    strstart(filename, "file:", &filename);
 -
 -    qdict_put_str(options, "filename", filename);
 +    bdrv_parse_filename_strip_prefix(filename, "file:", options);
  }
  static QemuOptsList raw_runtime_opts = {
@@ -XXX,XX +XXX,XX @@ static int check_hdev_writable(BDRVRawState *s)
  static void hdev_parse_filename(const char *filename, QDict *options,
                                  Error **errp)
  {
 -    /* The prefix is optional, just as for "file". */
 -    strstart(filename, "host_device:", &filename);
 -
 -    qdict_put_str(options, "filename", filename);
 +    bdrv_parse_filename_strip_prefix(filename, "host_device:", options);
  }
  static bool hdev_is_sg(BlockDriverState *bs)
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
  static void cdrom_parse_filename(const char *filename, QDict *options,
                                   Error **errp)
  {
 -    /* The prefix is optional, just as for "file". */
 -    strstart(filename, "host_cdrom:", &filename);
 -
 -    qdict_put_str(options, "filename", filename);
 +    bdrv_parse_filename_strip_prefix(filename, "host_cdrom:", options);
  }
  #endif
 diff --git a/block/file-win32.c b/block/file-win32.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/file-win32.c
 +++ b/block/file-win32.c
@@ -XXX,XX +XXX,XX @@ static void raw_parse_flags(int flags, bool use_aio, int *access_flags,
  static void raw_parse_filename(const char *filename, QDict *options,
                                 Error **errp)
  {
 -    /* The filename does not have to be prefixed by the protocol name, since
 -     * "file" is the default protocol; therefore, the return value of this
 -     * function call can be ignored. */
 -    strstart(filename, "file:", &filename);
 -
 -    qdict_put_str(options, "filename", filename);
 +    bdrv_parse_filename_strip_prefix(filename, "file:", options);
  }
  static QemuOptsList raw_runtime_opts = {
@@ -XXX,XX +XXX,XX @@ static int hdev_probe_device(const char *filename)
  static void hdev_parse_filename(const char *filename, QDict *options,
                                  Error **errp)
  {
 -    /* The prefix is optional, just as for "file". */
 -    strstart(filename, "host_device:", &filename);
 -
 -    qdict_put_str(options, "filename", filename);
 +    bdrv_parse_filename_strip_prefix(filename, "host_device:", options);
  }
  static int hdev_open(BlockDriverState *bs, QDict *options, int flags,
 diff --git a/include/block/block_int.h b/include/block/block_int.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/block/block_int.h
 +++ b/include/block/block_int.h
@@ -XXX,XX +XXX,XX @@ int get_tmp_filename(char *filename, int size);
  BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
                              const char *filename);
 +void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,
 +                                      QDict *options);
 +
  /**
   * bdrv_add_before_write_notifier:
 --
-.8.3.1
+.20.1

-[Qemu-devel] [PULL 14/15] block: Fix backing paths for filenames with colons
+[PULL v2 3/4] iotests: Require Python 3.6 or later
-From: Max Reitz <mreitz@redhat.com>
+Running iotests is not required to build QEMU, so we can have stricter
 version requirements for Python here and can make use of new features
 and drop compatibility code earlier.
-path_combine() naturally tries to preserve a protocol prefix. However,
+This makes qemu-iotests skip all Python tests if a Python version before
-it recognizes such a prefix by scanning for the first colon; which is
+.6 is used for the build.
 different from what path_has_protocol() does: There only is a protocol
 prefix if there is a colon before the first slash.
-A protocol prefix that is not recognized by path_has_protocol() is none,
+Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
-and should thus not be taken as one.
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
 Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 ---
  tests/qemu-iotests/check | 13 ++++++++++++-
 file changed, 12 insertions(+), 1 deletion(-)
-Case in point, before this patch:
+diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
-$ ./qemu-img create -f qcow2 -b backing.qcow2 ./top:image.qcow2
+index XXXXXXX..XXXXXXX 100755
-qemu-img: ./top:image.qcow2: Could not open './top:backing.qcow2':
+--- a/tests/qemu-iotests/check
-    No such file or directory
++++ b/tests/qemu-iotests/check
+@@ -XXX,XX +XXX,XX @@ then
-Afterwards:
+     export SOCKET_SCM_HELPER="$build_iotests/socket_scm_helper"
-$ ./qemu-img create -f qcow2 -b backing.qcow2 ./top:image.qcow2
+ fi
-qemu-img: ./top:image.qcow2: Could not open './backing.qcow2':
-    No such file or directory
++python_usable=false
++if $PYTHON -c 'import sys; sys.exit(0 if sys.version_info >= (3,6) else 1)'
-Reported-by: yangyang <yangyang@redhat.com>
++then
-Signed-off-by: Max Reitz <mreitz@redhat.com>
++    python_usable=true
-Reviewed-by: Eric Blake <eblake@redhat.com>
++fi
 Message-id: 20170522195217.12991-2-mreitz@redhat.com
 Signed-off-by: Max Reitz <mreitz@redhat.com>
 ---
  block.c | 15 ++++++++++-----
 file changed, 10 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,
      if (path_is_absolute(filename)) {
          pstrcpy(dest, dest_size, filename);
      } else {
 -        p = strchr(base_path, ':');
 -        if (p)
 -            p++;
 -        else
 -            p = base_path;
 +        const char *protocol_stripped = NULL;
 +
-+        if (path_has_protocol(base_path)) {
+ default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')
-+            protocol_stripped = strchr(base_path, ':');
+ default_alias_machine=$($QEMU_PROG -machine help | \
-+            if (protocol_stripped) {
+    sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }")
-+                protocol_stripped++;
+@@ -XXX,XX +XXX,XX @@ do
-+            }
+         start=$(_wallclock)
-+        }
-+        p = protocol_stripped ?: base_path;
+         if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python" ]; then
-+
+-            run_command="$PYTHON $seq"
-         p1 = strrchr(base_path, '/');
++            if $python_usable; then
- #ifdef _WIN32
++                run_command="$PYTHON $seq"
-         {
++            else
 +                run_command="false"
 +                echo "Unsupported Python version" > $seq.notrun
 +            fi
          else
              run_command="./$seq"
          fi
 --
-.8.3.1
+.20.1

-[Qemu-devel] [PULL 02/15] qemu-iotests: Test streaming with missing job ID
+[PULL v2 4/4] iotests: Remove Python 2 compatibility code
-This adds a small test for the image streaming error path for failing
+Some scripts check the Python version number and have two code paths to
-block_job_create(), which would have found the null pointer dereference
+accomodate both Python 2 and 3. Remove the code specific to Python 2 and
-in commit a170a91f.
+assert the minimum version of 3.6 instead (check skips Python tests in
 this case, so the assertion would only ever trigger if a Python script
 is executed manually).
 Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Alberto Garcia <berto@igalia.com>
+Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
-Reviewed-by: Kashyap Chamarthy <kchamart@redhat.com>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+Reviewed-by: John Snow <jsnow@redhat.com>
 Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 ---
- tests/qemu-iotests/030     | 4 ++++
+ tests/qemu-iotests/044        |  3 ---
- tests/qemu-iotests/030.out | 4 ++--
+ tests/qemu-iotests/163        |  3 ---
-files changed, 6 insertions(+), 2 deletions(-)
+ tests/qemu-iotests/iotests.py | 13 +++----------
 files changed, 3 insertions(+), 16 deletions(-)
-diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
+diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044
 index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/030
+--- a/tests/qemu-iotests/044
-+++ b/tests/qemu-iotests/030
++++ b/tests/qemu-iotests/044
-@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(iotests.QMPTestCase):
+@@ -XXX,XX +XXX,XX @@ import struct
-         result = self.vm.qmp('block-stream', device='nonexistent')
+ import subprocess
-         self.assert_qmp(result, 'error/class', 'GenericError')
+ import sys
-+    def test_job_id_missing(self):
+-if sys.version_info.major == 2:
-+        result = self.vm.qmp('block-stream', device='mid')
+-    range = xrange
-+        self.assert_qmp(result, 'error/class', 'GenericError')
+-
-+
+ test_img = os.path.join(iotests.test_dir, 'test.img')
- class TestParallelOps(iotests.QMPTestCase):
+ class TestRefcountTableGrowth(iotests.QMPTestCase):
-     num_ops = 4 # Number of parallel block-stream operations
+diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163
-diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out
+index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/163
 +++ b/tests/qemu-iotests/163
@@ -XXX,XX +XXX,XX @@
  import os, random, iotests, struct, qcow2, sys
  from iotests import qemu_img, qemu_io, image_size
 -if sys.version_info.major == 2:
 -    range = xrange
 -
  test_img = os.path.join(iotests.test_dir, 'test.img')
  check_img = os.path.join(iotests.test_dir, 'check.img')
 diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/030.out
+--- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/030.out
++++ b/tests/qemu-iotests/iotests.py
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ from collections import OrderedDict
--......................
+ sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
-+.......................
+ from qemu import qtest
- ----------------------------------------------------------------------
--Ran 22 tests
++assert sys.version_info >= (3,6)
-+Ran 23 tests
+ # This will not work if arguments contain spaces but is necessary if we
- OK
+ # want to support the override options that ./check supports.
@@ -XXX,XX +XXX,XX @@ def image_size(img):
      return json.loads(r)['virtual-size']
  def is_str(val):
 -    if sys.version_info.major >= 3:
 -        return isinstance(val, str)
 -    else:
 -        return isinstance(val, str) or isinstance(val, unicode)
 +    return isinstance(val, str)
  test_dir_re = re.compile(r"%s" % test_dir)
  def filter_test_dir(msg):
@@ -XXX,XX +XXX,XX @@ def execute_test(test_function=None,
      else:
          # We need to filter out the time taken from the output so that
          # qemu-iotest can reliably diff the results against master output.
 -        if sys.version_info.major >= 3:
 -            output = io.StringIO()
 -        else:
 -            # io.StringIO is for unicode strings, which is not what
 -            # 2.x's test runner emits.
 -            output = io.BytesIO()
 +        output = io.StringIO()
      logging.basicConfig(level=(logging.DEBUG if debug else logging.WARN))
 --
-.8.3.1
+.20.1

-[Qemu-devel] [PULL 03/15] iotests: 147: Don't test inet6 if not available
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-This is the case in our docker tests, as we use --net=none there. Skip
-this method.
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/147 | 7 +++++++
-file changed, 7 insertions(+)
-diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147
-index XXXXXXX..XXXXXXX 100755
---- a/tests/qemu-iotests/147
-+++ b/tests/qemu-iotests/147
-@@ -XXX,XX +XXX,XX @@ class BuiltinNBD(NBDBlockdevAddBase):
-         self._server_down()
-     def test_inet6(self):
-+        try:
-+            socket.getaddrinfo("::0", "0", socket.AF_INET6,
-+                               socket.SOCK_STREAM, socket.IPPROTO_TCP,
-+                               socket.AI_ADDRCONFIG | socket.AI_CANONNAME)
-+        except socket.gaierror:
-+            # IPv6 not available, skip
-+            return
-         address = { 'type': 'inet',
-                     'data': {
-                         'host': '::1',
---
-.8.3.1

-[Qemu-devel] [PULL 04/15] nvme: Add support for Controller Memory Buffers
+Deleted patch
-From: Stephen Bates <sbates@raithlin.com>
-Implement NVMe Controller Memory Buffers (CMBs) which were added in
-version 1.2 of the NVMe Specification. This patch adds an optional
-argument (cmb_size_mb) which indicates the size of the CMB (in
-MB). Currently only the Submission Queue Support (SQS) is enabled
-which aligns with the current Linux driver for NVMe.
-Signed-off-by: Stephen Bates <sbates@raithlin.com>
-Acked-by: Keith Busch <keith.busch@intel.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- hw/block/nvme.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- hw/block/nvme.h | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
-files changed, 144 insertions(+), 4 deletions(-)
-diff --git a/hw/block/nvme.c b/hw/block/nvme.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/block/nvme.c
-+++ b/hw/block/nvme.c
-@@ -XXX,XX +XXX,XX @@
-  */
- /**
-- * Reference Specs: http://www.nvmexpress.org, 1.1, 1.0e
-+ * Reference Specs: http://www.nvmexpress.org, 1.2, 1.1, 1.0e
-  *
-  *  http://www.nvmexpress.org/resources/
-  */
-@@ -XXX,XX +XXX,XX @@
- /**
-  * Usage: add options:
-  *      -drive file=<file>,if=none,id=<drive_id>
-- *      -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>
-+ *      -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \
-+ *              cmb_size_mb=<cmb_size_mb[optional]>
-+ *
-+ * Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at
-+ * offset 0 in BAR2 and supports SQS only for now.
-  */
- #include "qemu/osdep.h"
-@@ -XXX,XX +XXX,XX @@
- static void nvme_process_sq(void *opaque);
-+static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size)
-+{
-+    if (n->cmbsz && addr >= n->ctrl_mem.addr &&
-+                addr < (n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size))) {
-+        memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size);
-+    } else {
-+        pci_dma_read(&n->parent_obj, addr, buf, size);
-+    }
-+}
-+
- static int nvme_check_sqid(NvmeCtrl *n, uint16_t sqid)
- {
-     return sqid < n->num_queues && n->sq[sqid] != NULL ? 0 : -1;
-@@ -XXX,XX +XXX,XX @@ static void nvme_process_sq(void *opaque)
-     while (!(nvme_sq_empty(sq) || QTAILQ_EMPTY(&sq->req_list))) {
-         addr = sq->dma_addr + sq->head * n->sqe_size;
--        pci_dma_read(&n->parent_obj, addr, (void *)&cmd, sizeof(cmd));
-+        nvme_addr_read(n, addr, (void *)&cmd, sizeof(cmd));
-         nvme_inc_sq_head(sq);
-         req = QTAILQ_FIRST(&sq->req_list);
-@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps nvme_mmio_ops = {
-     },
- };
-+static void nvme_cmb_write(void *opaque, hwaddr addr, uint64_t data,
-+    unsigned size)
-+{
-+    NvmeCtrl *n = (NvmeCtrl *)opaque;
-+    memcpy(&n->cmbuf[addr], &data, size);
-+}
-+
-+static uint64_t nvme_cmb_read(void *opaque, hwaddr addr, unsigned size)
-+{
-+    uint64_t val;
-+    NvmeCtrl *n = (NvmeCtrl *)opaque;
-+
-+    memcpy(&val, &n->cmbuf[addr], size);
-+    return val;
-+}
-+
-+static const MemoryRegionOps nvme_cmb_ops = {
-+    .read = nvme_cmb_read,
-+    .write = nvme_cmb_write,
-+    .endianness = DEVICE_LITTLE_ENDIAN,
-+    .impl = {
-+        .min_access_size = 2,
-+        .max_access_size = 8,
-+    },
-+};
-+
- static int nvme_init(PCIDevice *pci_dev)
- {
-     NvmeCtrl *n = NVME(pci_dev);
-@@ -XXX,XX +XXX,XX @@ static int nvme_init(PCIDevice *pci_dev)
-     NVME_CAP_SET_CSS(n->bar.cap, 1);
-     NVME_CAP_SET_MPSMAX(n->bar.cap, 4);
--    n->bar.vs = 0x00010100;
-+    n->bar.vs = 0x00010200;
-     n->bar.intmc = n->bar.intms = 0;
-+    if (n->cmb_size_mb) {
-+
-+        NVME_CMBLOC_SET_BIR(n->bar.cmbloc, 2);
-+        NVME_CMBLOC_SET_OFST(n->bar.cmbloc, 0);
-+
-+        NVME_CMBSZ_SET_SQS(n->bar.cmbsz, 1);
-+        NVME_CMBSZ_SET_CQS(n->bar.cmbsz, 0);
-+        NVME_CMBSZ_SET_LISTS(n->bar.cmbsz, 0);
-+        NVME_CMBSZ_SET_RDS(n->bar.cmbsz, 0);
-+        NVME_CMBSZ_SET_WDS(n->bar.cmbsz, 0);
-+        NVME_CMBSZ_SET_SZU(n->bar.cmbsz, 2); /* MBs */
-+        NVME_CMBSZ_SET_SZ(n->bar.cmbsz, n->cmb_size_mb);
-+
-+        n->cmbuf = g_malloc0(NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
-+        memory_region_init_io(&n->ctrl_mem, OBJECT(n), &nvme_cmb_ops, n,
-+                              "nvme-cmb", NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
-+        pci_register_bar(&n->parent_obj, NVME_CMBLOC_BIR(n->bar.cmbloc),
-+            PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64 |
-+            PCI_BASE_ADDRESS_MEM_PREFETCH, &n->ctrl_mem);
-+
-+    }
-+
-     for (i = 0; i < n->num_namespaces; i++) {
-         NvmeNamespace *ns = &n->namespaces[i];
-         NvmeIdNs *id_ns = &ns->id_ns;
-@@ -XXX,XX +XXX,XX @@ static void nvme_exit(PCIDevice *pci_dev)
-     g_free(n->namespaces);
-     g_free(n->cq);
-     g_free(n->sq);
-+    if (n->cmbsz) {
-+        memory_region_unref(&n->ctrl_mem);
-+    }
-+
-     msix_uninit_exclusive_bar(pci_dev);
- }
- static Property nvme_props[] = {
-     DEFINE_BLOCK_PROPERTIES(NvmeCtrl, conf),
-     DEFINE_PROP_STRING("serial", NvmeCtrl, serial),
-+    DEFINE_PROP_UINT32("cmb_size_mb", NvmeCtrl, cmb_size_mb, 0),
-     DEFINE_PROP_END_OF_LIST(),
- };
-diff --git a/hw/block/nvme.h b/hw/block/nvme.h
-index XXXXXXX..XXXXXXX 100644
---- a/hw/block/nvme.h
-+++ b/hw/block/nvme.h
-@@ -XXX,XX +XXX,XX @@ typedef struct NvmeBar {
-     uint32_t    aqa;
-     uint64_t    asq;
-     uint64_t    acq;
-+    uint32_t    cmbloc;
-+    uint32_t    cmbsz;
- } NvmeBar;
- enum NvmeCapShift {
-@@ -XXX,XX +XXX,XX @@ enum NvmeAqaMask {
- #define NVME_AQA_ASQS(aqa) ((aqa >> AQA_ASQS_SHIFT) & AQA_ASQS_MASK)
- #define NVME_AQA_ACQS(aqa) ((aqa >> AQA_ACQS_SHIFT) & AQA_ACQS_MASK)
-+enum NvmeCmblocShift {
-+    CMBLOC_BIR_SHIFT  = 0,
-+    CMBLOC_OFST_SHIFT = 12,
-+};
-+
-+enum NvmeCmblocMask {
-+    CMBLOC_BIR_MASK  = 0x7,
-+    CMBLOC_OFST_MASK = 0xfffff,
-+};
-+
-+#define NVME_CMBLOC_BIR(cmbloc) ((cmbloc >> CMBLOC_BIR_SHIFT)  & \
-+                                 CMBLOC_BIR_MASK)
-+#define NVME_CMBLOC_OFST(cmbloc)((cmbloc >> CMBLOC_OFST_SHIFT) & \
-+                                 CMBLOC_OFST_MASK)
-+
-+#define NVME_CMBLOC_SET_BIR(cmbloc, val)  \
-+    (cmbloc |= (uint64_t)(val & CMBLOC_BIR_MASK) << CMBLOC_BIR_SHIFT)
-+#define NVME_CMBLOC_SET_OFST(cmbloc, val) \
-+    (cmbloc |= (uint64_t)(val & CMBLOC_OFST_MASK) << CMBLOC_OFST_SHIFT)
-+
-+enum NvmeCmbszShift {
-+    CMBSZ_SQS_SHIFT   = 0,
-+    CMBSZ_CQS_SHIFT   = 1,
-+    CMBSZ_LISTS_SHIFT = 2,
-+    CMBSZ_RDS_SHIFT   = 3,
-+    CMBSZ_WDS_SHIFT   = 4,
-+    CMBSZ_SZU_SHIFT   = 8,
-+    CMBSZ_SZ_SHIFT    = 12,
-+};
-+
-+enum NvmeCmbszMask {
-+    CMBSZ_SQS_MASK   = 0x1,
-+    CMBSZ_CQS_MASK   = 0x1,
-+    CMBSZ_LISTS_MASK = 0x1,
-+    CMBSZ_RDS_MASK   = 0x1,
-+    CMBSZ_WDS_MASK   = 0x1,
-+    CMBSZ_SZU_MASK   = 0xf,
-+    CMBSZ_SZ_MASK    = 0xfffff,
-+};
-+
-+#define NVME_CMBSZ_SQS(cmbsz)  ((cmbsz >> CMBSZ_SQS_SHIFT)   & CMBSZ_SQS_MASK)
-+#define NVME_CMBSZ_CQS(cmbsz)  ((cmbsz >> CMBSZ_CQS_SHIFT)   & CMBSZ_CQS_MASK)
-+#define NVME_CMBSZ_LISTS(cmbsz)((cmbsz >> CMBSZ_LISTS_SHIFT) & CMBSZ_LISTS_MASK)
-+#define NVME_CMBSZ_RDS(cmbsz)  ((cmbsz >> CMBSZ_RDS_SHIFT)   & CMBSZ_RDS_MASK)
-+#define NVME_CMBSZ_WDS(cmbsz)  ((cmbsz >> CMBSZ_WDS_SHIFT)   & CMBSZ_WDS_MASK)
-+#define NVME_CMBSZ_SZU(cmbsz)  ((cmbsz >> CMBSZ_SZU_SHIFT)   & CMBSZ_SZU_MASK)
-+#define NVME_CMBSZ_SZ(cmbsz)   ((cmbsz >> CMBSZ_SZ_SHIFT)    & CMBSZ_SZ_MASK)
-+
-+#define NVME_CMBSZ_SET_SQS(cmbsz, val)   \
-+    (cmbsz |= (uint64_t)(val &  CMBSZ_SQS_MASK)  << CMBSZ_SQS_SHIFT)
-+#define NVME_CMBSZ_SET_CQS(cmbsz, val)   \
-+    (cmbsz |= (uint64_t)(val & CMBSZ_CQS_MASK) << CMBSZ_CQS_SHIFT)
-+#define NVME_CMBSZ_SET_LISTS(cmbsz, val) \
-+    (cmbsz |= (uint64_t)(val & CMBSZ_LISTS_MASK) << CMBSZ_LISTS_SHIFT)
-+#define NVME_CMBSZ_SET_RDS(cmbsz, val)   \
-+    (cmbsz |= (uint64_t)(val & CMBSZ_RDS_MASK) << CMBSZ_RDS_SHIFT)
-+#define NVME_CMBSZ_SET_WDS(cmbsz, val)   \
-+    (cmbsz |= (uint64_t)(val & CMBSZ_WDS_MASK) << CMBSZ_WDS_SHIFT)
-+#define NVME_CMBSZ_SET_SZU(cmbsz, val)   \
-+    (cmbsz |= (uint64_t)(val & CMBSZ_SZU_MASK) << CMBSZ_SZU_SHIFT)
-+#define NVME_CMBSZ_SET_SZ(cmbsz, val)    \
-+    (cmbsz |= (uint64_t)(val & CMBSZ_SZ_MASK) << CMBSZ_SZ_SHIFT)
-+
-+#define NVME_CMBSZ_GETSIZE(cmbsz) \
-+    (NVME_CMBSZ_SZ(cmbsz) * (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz))))
-+
- typedef struct NvmeCmd {
-     uint8_t     opcode;
-     uint8_t     fuse;
-@@ -XXX,XX +XXX,XX @@ typedef struct NvmeNamespace {
- typedef struct NvmeCtrl {
-     PCIDevice    parent_obj;
-     MemoryRegion iomem;
-+    MemoryRegion ctrl_mem;
-     NvmeBar      bar;
-     BlockConf    conf;
-@@ -XXX,XX +XXX,XX @@ typedef struct NvmeCtrl {
-     uint32_t    num_queues;
-     uint32_t    max_q_ents;
-     uint64_t    ns_size;
-+    uint32_t    cmb_size_mb;
-+    uint32_t    cmbsz;
-+    uint32_t    cmbloc;
-+    uint8_t     *cmbuf;
-     char            *serial;
-     NvmeNamespace   *namespaces;
---
-.8.3.1

-[Qemu-devel] [PULL 06/15] qcow2: remove extra local_error variable
+Deleted patch
-From: Alberto Garcia <berto@igalia.com>
-Commit d7086422b1c1e75e320519cfe26176db6ec97a37 added a local_err
-variable global to the qcow2_amend_options() function, so there's no
-need to have this other one.
-Signed-off-by: Alberto Garcia <berto@igalia.com>
-Message-id: 20170511150337.21470-1-berto@igalia.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/qcow2.c | 5 ++---
-file changed, 2 insertions(+), 3 deletions(-)
-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 int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
-     if (s->refcount_bits != refcount_bits) {
-         int refcount_order = ctz32(refcount_bits);
--        Error *local_error = NULL;
-         if (new_version < 3 && refcount_bits != 16) {
-             error_report("Different refcount widths than 16 bits require "
-@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
-         helper_cb_info.current_operation = QCOW2_CHANGING_REFCOUNT_ORDER;
-         ret = qcow2_change_refcount_order(bs, refcount_order,
-                                           &qcow2_amend_helper_cb,
--                                          &helper_cb_info, &local_error);
-+                                          &helper_cb_info, &local_err);
-         if (ret < 0) {
--            error_report_err(local_error);
-+            error_report_err(local_err);
-             return ret;
-         }
-     }
---
-.8.3.1

-[Qemu-devel] [PULL 07/15] qemu-img: Fix documentation of convert
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-It got lost in commit a8d16f9ca "qemu-img: Update documentation for -U".
-Reported-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Message-id: 20170515103551.31313-1-famz@redhat.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qemu-img-cmds.hx | 4 ++--
-file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-img-cmds.hx
-+++ b/qemu-img-cmds.hx
-@@ -XXX,XX +XXX,XX @@ STEXI
- ETEXI
- DEF("convert", img_convert,
--    "convert [--object objectdef] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")
-+    "convert [--object objectdef] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")
- STEXI
--@item convert [--object @var{objectdef}] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}
-+@item convert [--object @var{objectdef}] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}
- ETEXI
- DEF("dd", img_dd,
---
-.8.3.1

-[Qemu-devel] [PULL 08/15] qemu-img: add support for --object with 'dd' command
+Deleted patch
-From: "Daniel P. Berrange" <berrange@redhat.com>
-The qemu-img dd command added --image-opts support, but missed
-the corresponding --object support. This prevented passing
-secrets (eg auth passwords) needed by certain disk images.
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-Message-id: 20170515164712.6643-2-berrange@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qemu-img.c | 18 ++++++++++++++++++
-file changed, 18 insertions(+)
-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_dd(int argc, char **argv)
-     };
-     const struct option long_options[] = {
-         { "help", no_argument, 0, 'h'},
-+        { "object", required_argument, 0, OPTION_OBJECT},
-         { "image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
-         { "force-share", no_argument, 0, 'U'},
-         { 0, 0, 0, 0 }
-@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)
-         case 'U':
-             force_share = true;
-             break;
-+        case OPTION_OBJECT: {
-+            QemuOpts *opts;
-+            opts = qemu_opts_parse_noisily(&qemu_object_opts,
-+                                           optarg, true);
-+            if (!opts) {
-+                ret = -1;
-+                goto out;
-+            }
-+        }   break;
-         case OPTION_IMAGE_OPTS:
-             image_opts = true;
-             break;
-@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)
-         ret = -1;
-         goto out;
-     }
-+
-+    if (qemu_opts_foreach(&qemu_object_opts,
-+                          user_creatable_add_opts_foreach,
-+                          NULL, NULL)) {
-+        ret = -1;
-+        goto out;
-+    }
-+
-     blk1 = img_open(image_opts, in.filename, fmt, 0, false, false,
-                     force_share);
---
-.8.3.1

-[Qemu-devel] [PULL 09/15] qemu-img: fix --image-opts usage with dd command
+Deleted patch
-From: "Daniel P. Berrange" <berrange@redhat.com>
-The --image-opts flag can only be used to affect the parsing
-of the source image. The target image has to be specified in
-the traditional style regardless, since it needs to be passed
-to the bdrv_create() API which does not support the new style
-opts.
-Reviewed-by: Fam Zheng <famz@redhat.com>
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-Message-id: 20170515164712.6643-3-berrange@redhat.com
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qemu-img.c | 9 +++++++--
-file changed, 7 insertions(+), 2 deletions(-)
-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_dd(int argc, char **argv)
-         goto out;
-     }
--    blk2 = img_open(image_opts, out.filename, out_fmt, BDRV_O_RDWR,
--                    false, false, false);
-+    /* TODO, we can't honour --image-opts for the target,
-+     * since it needs to be given in a format compatible
-+     * with the bdrv_create() call above which does not
-+     * support image-opts style.
-+     */
-+    blk2 = img_open_file(out.filename, out_fmt, BDRV_O_RDWR,
-+                         false, false, false);
-     if (!blk2) {
-         ret = -1;
---
-.8.3.1

-[Qemu-devel] [PULL 10/15] qemu-img: introduce --target-image-opts for 'convert' command
+Deleted patch
-From: "Daniel P. Berrange" <berrange@redhat.com>
-The '--image-opts' flag indicates whether the source filename
-includes options. The target filename has to remain in the
-plain filename format though, since it needs to be passed to
-bdrv_create().  When using --skip-create though, it would be
-possible to use image-opts syntax. This adds --target-image-opts
-to indicate that the target filename includes options. Currently
-this mandates use of the --skip-create flag too.
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-Message-id: 20170515164712.6643-4-berrange@redhat.com
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qemu-img-cmds.hx |  4 +--
- qemu-img.c       | 84 ++++++++++++++++++++++++++++++++++++++------------------
- qemu-img.texi    | 12 ++++++--
-files changed, 69 insertions(+), 31 deletions(-)
-diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-img-cmds.hx
-+++ b/qemu-img-cmds.hx
-@@ -XXX,XX +XXX,XX @@ STEXI
- ETEXI
- DEF("convert", img_convert,
--    "convert [--object objectdef] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")
-+    "convert [--object objectdef] [--image-opts] [--target-image-opts] [-U] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")
- STEXI
--@item convert [--object @var{objectdef}] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}
-+@item convert [--object @var{objectdef}] [--image-opts] [--target-image-opts] [-U] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}
- ETEXI
- DEF("dd", img_dd,
-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 @@ enum {
-     OPTION_PATTERN = 260,
-     OPTION_FLUSH_INTERVAL = 261,
-     OPTION_NO_DRAIN = 262,
-+    OPTION_TARGET_IMAGE_OPTS = 263,
- };
- typedef enum OutputFormat {
-@@ -XXX,XX +XXX,XX @@ static int convert_do_copy(ImgConvertState *s)
- static int img_convert(int argc, char **argv)
- {
-     int c, bs_i, flags, src_flags = 0;
--    const char *fmt = NULL, *out_fmt = "raw", *cache = "unsafe",
-+    const char *fmt = NULL, *out_fmt = NULL, *cache = "unsafe",
-                *src_cache = BDRV_DEFAULT_CACHE, *out_baseimg = NULL,
-                *out_filename, *out_baseimg_param, *snapshot_name = NULL;
--    BlockDriver *drv, *proto_drv;
-+    BlockDriver *drv = NULL, *proto_drv = NULL;
-     BlockDriverInfo bdi;
-     BlockDriverState *out_bs;
-     QemuOpts *opts = NULL, *sn_opts = NULL;
-@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-     char *options = NULL;
-     Error *local_err = NULL;
-     bool writethrough, src_writethrough, quiet = false, image_opts = false,
--         skip_create = false, progress = false;
-+         skip_create = false, progress = false, tgt_image_opts = false;
-     int64_t ret = -EINVAL;
-     bool force_share = false;
-@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-             {"object", required_argument, 0, OPTION_OBJECT},
-             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
-             {"force-share", no_argument, 0, 'U'},
-+            {"target-image-opts", no_argument, 0, OPTION_TARGET_IMAGE_OPTS},
-             {0, 0, 0, 0}
-         };
-         c = getopt_long(argc, argv, ":hf:O:B:ce6o:s:l:S:pt:T:qnm:WU",
-@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-         case OPTION_IMAGE_OPTS:
-             image_opts = true;
-             break;
-+        case OPTION_TARGET_IMAGE_OPTS:
-+            tgt_image_opts = true;
-+            break;
-         }
-     }
-+    if (!out_fmt && !tgt_image_opts) {
-+        out_fmt = "raw";
-+    }
-+
-     if (qemu_opts_foreach(&qemu_object_opts,
-                           user_creatable_add_opts_foreach,
-                           NULL, NULL)) {
-@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-         goto fail_getopt;
-     }
-+    if (tgt_image_opts && !skip_create) {
-+        error_report("--target-image-opts requires use of -n flag");
-+        goto fail_getopt;
-+    }
-+
-     s.src_num = argc - optind - 1;
-     out_filename = s.src_num >= 1 ? argv[argc - 1] : NULL;
-     if (options && has_help_option(options)) {
--        ret = print_block_option_help(out_filename, out_fmt);
--        goto fail_getopt;
-+        if (out_fmt) {
-+            ret = print_block_option_help(out_filename, out_fmt);
-+            goto fail_getopt;
-+        } else {
-+            error_report("Option help requires a format be specified");
-+            goto fail_getopt;
-+        }
-     }
-     if (s.src_num < 1) {
-@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-         goto out;
-     }
--    /* Find driver and parse its options */
--    drv = bdrv_find_format(out_fmt);
--    if (!drv) {
--        error_report("Unknown file format '%s'", out_fmt);
--        ret = -1;
--        goto out;
--    }
-+    if (!skip_create) {
-+        /* Find driver and parse its options */
-+        drv = bdrv_find_format(out_fmt);
-+        if (!drv) {
-+            error_report("Unknown file format '%s'", out_fmt);
-+            ret = -1;
-+            goto out;
-+        }
--    proto_drv = bdrv_find_protocol(out_filename, true, &local_err);
--    if (!proto_drv) {
--        error_report_err(local_err);
--        ret = -1;
--        goto out;
--    }
-+        proto_drv = bdrv_find_protocol(out_filename, true, &local_err);
-+        if (!proto_drv) {
-+            error_report_err(local_err);
-+            ret = -1;
-+            goto out;
-+        }
--    if (!skip_create) {
-         if (!drv->create_opts) {
-             error_report("Format driver '%s' does not support image creation",
-                          drv->format_name);
-@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-         const char *preallocation =
-             qemu_opt_get(opts, BLOCK_OPT_PREALLOC);
--        if (!drv->bdrv_co_pwritev_compressed) {
-+        if (drv && !drv->bdrv_co_pwritev_compressed) {
-             error_report("Compression not supported for this file format");
-             ret = -1;
-             goto out;
-@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-         goto out;
-     }
--    /* XXX we should allow --image-opts to trigger use of
--     * img_open() here, but then we have trouble with
--     * the bdrv_create() call which takes different params.
--     * Not critical right now, so fix can wait...
--     */
--    s.target = img_open_file(out_filename, out_fmt, flags, writethrough, quiet,
--                             false);
-+    if (skip_create) {
-+        s.target = img_open(tgt_image_opts, out_filename, out_fmt,
-+                            flags, writethrough, quiet, false);
-+    } else {
-+        /* TODO ultimately we should allow --target-image-opts
-+         * to be used even when -n is not given.
-+         * That has to wait for bdrv_create to be improved
-+         * to allow filenames in option syntax
-+         */
-+        s.target = img_open_file(out_filename, out_fmt, flags,
-+                                 writethrough, quiet, false);
-+    }
-     if (!s.target) {
-         ret = -1;
-         goto out;
-     }
-     out_bs = blk_bs(s.target);
-+    if (s.compressed && !out_bs->drv->bdrv_co_pwritev_compressed) {
-+        error_report("Compression not supported for this file format");
-+        ret = -1;
-+        goto out;
-+    }
-+
-     /* increase bufsectors from the default 4096 (2M) if opt_transfer
-      * or discard_alignment of the out_bs is greater. Limit to 32768 (16MB)
-      * as maximum. */
-diff --git a/qemu-img.texi b/qemu-img.texi
-index XXXXXXX..XXXXXXX 100644
---- a/qemu-img.texi
-+++ b/qemu-img.texi
-@@ -XXX,XX +XXX,XX @@ keys.
- @item --image-opts
--Indicates that the @var{filename} parameter is to be interpreted as a
-+Indicates that the source @var{filename} parameter is to be interpreted as a
- full option string, not a plain filename. This parameter is mutually
--exclusive with the @var{-f} and @var{-F} parameters.
-+exclusive with the @var{-f} parameter.
-+
-+@item --target-image-opts
-+
-+Indicates that the @var{output_filename} parameter(s) are to be interpreted as
-+a full option string, not a plain filename. This parameter is mutually
-+exclusive with the @var{-O} parameters. It is currently required to also use
-+the @var{-n} parameter to skip image creation. This restriction may be relaxed
-+in a future release.
- @item fmt
- is the disk image format. It is guessed automatically in most cases. See below
---
-.8.3.1

-[Qemu-devel] [PULL 11/15] qemu-img: copy *key-secret opts when opening newly created files
+Deleted patch
-From: "Daniel P. Berrange" <berrange@redhat.com>
-The qemu-img dd/convert commands will create an image file and
-then try to open it. Historically it has been possible to open
-new files without passing any options. With encrypted files
-though, the *key-secret options are mandatory, so we need to
-provide those options when opening the newly created file.
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-Message-id: 20170515164712.6643-5-berrange@redhat.com
-Reviewed-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qemu-img.c | 42 +++++++++++++++++++++++++++++++++++++-----
-file changed, 37 insertions(+), 5 deletions(-)
-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 BlockBackend *img_open_opts(const char *optstr,
- }
- static BlockBackend *img_open_file(const char *filename,
-+                                   QDict *options,
-                                    const char *fmt, int flags,
-                                    bool writethrough, bool quiet,
-                                    bool force_share)
- {
-     BlockBackend *blk;
-     Error *local_err = NULL;
--    QDict *options = qdict_new();
-+    if (!options) {
-+        options = qdict_new();
-+    }
-     if (fmt) {
-         qdict_put_str(options, "driver", fmt);
-     }
-@@ -XXX,XX +XXX,XX @@ static BlockBackend *img_open_file(const char *filename,
- }
-+static int img_add_key_secrets(void *opaque,
-+                               const char *name, const char *value,
-+                               Error **errp)
-+{
-+    QDict *options = opaque;
-+
-+    if (g_str_has_suffix(name, "key-secret")) {
-+        qdict_put(options, name, qstring_from_str(value));
-+    }
-+
-+    return 0;
-+}
-+
-+static BlockBackend *img_open_new_file(const char *filename,
-+                                       QemuOpts *create_opts,
-+                                       const char *fmt, int flags,
-+                                       bool writethrough, bool quiet,
-+                                       bool force_share)
-+{
-+    QDict *options = NULL;
-+
-+    options = qdict_new();
-+    qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abort);
-+
-+    return img_open_file(filename, options, fmt, flags, writethrough, quiet,
-+                         force_share);
-+}
-+
-+
- static BlockBackend *img_open(bool image_opts,
-                               const char *filename,
-                               const char *fmt, int flags, bool writethrough,
-@@ -XXX,XX +XXX,XX @@ static BlockBackend *img_open(bool image_opts,
-         blk = img_open_opts(filename, opts, flags, writethrough, quiet,
-                             force_share);
-     } else {
--        blk = img_open_file(filename, fmt, flags, writethrough, quiet,
-+        blk = img_open_file(filename, NULL, fmt, flags, writethrough, quiet,
-                             force_share);
-     }
-     return blk;
-@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
-          * That has to wait for bdrv_create to be improved
-          * to allow filenames in option syntax
-          */
--        s.target = img_open_file(out_filename, out_fmt, flags,
--                                 writethrough, quiet, false);
-+        s.target = img_open_new_file(out_filename, opts, out_fmt,
-+                                     flags, writethrough, quiet, false);
-     }
-     if (!s.target) {
-         ret = -1;
-@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)
-      * with the bdrv_create() call above which does not
-      * support image-opts style.
-      */
--    blk2 = img_open_file(out.filename, out_fmt, BDRV_O_RDWR,
-+    blk2 = img_open_file(out.filename, NULL, out_fmt, BDRV_O_RDWR,
-                          false, false, false);
-     if (!blk2) {
---
-.8.3.1

-[Qemu-devel] [PULL 12/15] qemu-img: Fix leakage of options on error
+Deleted patch
-From: Fam Zheng <famz@redhat.com>
-Reported by Coverity.
-Signed-off-by: Fam Zheng <famz@redhat.com>
-Message-id: 20170515141014.25793-1-famz@redhat.com
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- qemu-img.c | 1 +
-file changed, 1 insertion(+)
-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 BlockBackend *img_open_opts(const char *optstr,
-         if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE)
-             && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) {
-             error_report("--force-share/-U conflicts with image options");
-+            QDECREF(options);
-             return NULL;
-         }
-         qdict_put(options, BDRV_OPT_FORCE_SHARE, qbool_from_bool(true));
---
-.8.3.1

-[Qemu-devel] [PULL 13/15] block: Tweak error message related to qemu-img amend
+Deleted patch
-From: Eric Blake <eblake@redhat.com>
-When converting a 1.1 image down to 0.10, qemu-iotests 060 forces
-a contrived failure where allocating a cluster used to replace a
-zero cluster reads unaligned data.  Since it is a zero cluster
-rather than a data cluster being converted, changing the error
-message to match our earlier change in 'qcow2: Make distinction
-between zero cluster types obvious' is worthwhile.
-Suggested-by: Max Reitz <mreitz@redhat.com>
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Message-id: 20170508171302.17805-1-eblake@redhat.com
-[mreitz: Commit message fixes]
-Signed-off-by: Max Reitz <mreitz@redhat.com>
----
- block/qcow2-cluster.c      | 3 ++-
- tests/qemu-iotests/060.out | 2 +-
-files changed, 3 insertions(+), 2 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 int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
-             }
-             if (offset_into_cluster(s, offset)) {
--                qcow2_signal_corruption(bs, true, -1, -1, "Data cluster offset "
-+                qcow2_signal_corruption(bs, true, -1, -1,
-+                                        "Cluster allocation offset "
-                                         "%#" PRIx64 " unaligned (L2 offset: %#"
-                                         PRIx64 ", L2 index: %#x)", offset,
-                                         l2_offset, j);
-diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
-index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/060.out
-+++ b/tests/qemu-iotests/060.out
-@@ -XXX,XX +XXX,XX @@ read failed: Input/output error
- Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- wrote 65536/65536 bytes at offset 0
-KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--qcow2: Marking image as corrupt: Data cluster offset 0x52a00 unaligned (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
-+qcow2: Marking image as corrupt: Cluster allocation offset 0x52a00 unaligned (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
- qemu-img: Error while amending options: Input/output error
- === Testing unaligned reftable entry ===
---
-.8.3.1

The following changes since commit 9964e96dc9999cf7f7c936ee854a795415d19b60:

Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging (2017-05-23 15:01:31 +0100)

are available in the git repository at:

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 42a48128417b3bfade93d1a4721348cc480e9e50:

Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block (2017-05-29 16:34:27 +0200)

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

Block layer patches

----------------------------------------------------------------
Alberto Garcia (2):
      stream: fix crash in stream_start() when block_job_create() fails
      qcow2: remove extra local_error variable

Daniel P. Berrange (4):
      qemu-img: add support for --object with 'dd' command
      qemu-img: fix --image-opts usage with dd command
      qemu-img: introduce --target-image-opts for 'convert' command
      qemu-img: copy *key-secret opts when opening newly created files

Eric Blake (1):
      block: Tweak error message related to qemu-img amend

Fam Zheng (3):
      iotests: 147: Don't test inet6 if not available
      qemu-img: Fix documentation of convert
      qemu-img: Fix leakage of options on error

Kevin Wolf (3):
      qemu-iotests: Test streaming with missing job ID
      mirror: Drop permissions on s->target on completion
      Merge remote-tracking branch 'mreitz/tags/pull-block-2017-05-29-v3' into queue-block

Max Reitz (2):
      block: Fix backing paths for filenames with colons
      block/file-*: *_parse_filename() and colons

Stephen Bates (1):
      nvme: Add support for Controller Memory Buffers

From: Alberto Garcia <berto@igalia.com>

The code that tries to reopen a BlockDriverState in stream_start()
when the creation of a new block job fails crashes because it attempts
to dereference a pointer that is known to be NULL.

This is a regression introduced in a170a91fd3eab6155da39e740381867e,
likely because the code was copied from stream_complete().

Cc: qemu-stable@nongnu.org
Reported-by: Kashyap Chamarthy <kchamart@redhat.com>
Signed-off-by: Alberto Garcia <berto@igalia.com>
Tested-by: Kashyap Chamarthy <kchamart@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/stream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/stream.c b/block/stream.c
index XXXXXXX..XXXXXXX 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -XXX,XX +XXX,XX @@ void stream_start(const char *job_id, BlockDriverState *bs,
 
 fail:
     if (orig_bs_flags != bdrv_get_flags(bs)) {
-        bdrv_reopen(bs, s->bs_flags, NULL);
+        bdrv_reopen(bs, orig_bs_flags, NULL);
     }
 }
-- 
1.8.3.1

This adds a small test for the image streaming error path for failing
block_job_create(), which would have found the null pointer dereference
in commit a170a91f.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kashyap Chamarthy <kchamart@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
---
 tests/qemu-iotests/030     | 4 ++++
 tests/qemu-iotests/030.out | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -XXX,XX +XXX,XX @@ class TestSingleDrive(iotests.QMPTestCase):
         result = self.vm.qmp('block-stream', device='nonexistent')
         self.assert_qmp(result, 'error/class', 'GenericError')
 
+    def test_job_id_missing(self):
+        result = self.vm.qmp('block-stream', device='mid')
+        self.assert_qmp(result, 'error/class', 'GenericError')
+
 
 class TestParallelOps(iotests.QMPTestCase):
     num_ops = 4 # Number of parallel block-stream operations
diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/030.out
+++ b/tests/qemu-iotests/030.out
@@ -XXX,XX +XXX,XX @@
-......................
+.......................
 ----------------------------------------------------------------------
-Ran 22 tests
+Ran 23 tests
 
 OK
-- 
1.8.3.1

From: Stephen Bates <sbates@raithlin.com>

Implement NVMe Controller Memory Buffers (CMBs) which were added in
version 1.2 of the NVMe Specification. This patch adds an optional
argument (cmb_size_mb) which indicates the size of the CMB (in
MB). Currently only the Submission Queue Support (SQS) is enabled
which aligns with the current Linux driver for NVMe.

Signed-off-by: Stephen Bates <sbates@raithlin.com>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/block/nvme.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 hw/block/nvme.h | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+), 4 deletions(-)

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -XXX,XX +XXX,XX @@
  */
 
 /**
- * Reference Specs: http://www.nvmexpress.org, 1.1, 1.0e
+ * Reference Specs: http://www.nvmexpress.org, 1.2, 1.1, 1.0e
  *
  *  http://www.nvmexpress.org/resources/
  */
@@ -XXX,XX +XXX,XX @@
 /**
  * Usage: add options:
  *      -drive file=<file>,if=none,id=<drive_id>
- *      -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>
+ *      -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \
+ *              cmb_size_mb=<cmb_size_mb[optional]>
+ *
+ * Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at
+ * offset 0 in BAR2 and supports SQS only for now.
  */
 
 #include "qemu/osdep.h"
@@ -XXX,XX +XXX,XX @@
 
 static void nvme_process_sq(void *opaque);
 
+static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size)
+{
+    if (n->cmbsz && addr >= n->ctrl_mem.addr &&
+                addr < (n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size))) {
+        memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size);
+    } else {
+        pci_dma_read(&n->parent_obj, addr, buf, size);
+    }
+}
+
 static int nvme_check_sqid(NvmeCtrl *n, uint16_t sqid)
 {
     return sqid < n->num_queues && n->sq[sqid] != NULL ? 0 : -1;
@@ -XXX,XX +XXX,XX @@ static void nvme_process_sq(void *opaque)
 
     while (!(nvme_sq_empty(sq) || QTAILQ_EMPTY(&sq->req_list))) {
         addr = sq->dma_addr + sq->head * n->sqe_size;
-        pci_dma_read(&n->parent_obj, addr, (void *)&cmd, sizeof(cmd));
+        nvme_addr_read(n, addr, (void *)&cmd, sizeof(cmd));
         nvme_inc_sq_head(sq);
 
         req = QTAILQ_FIRST(&sq->req_list);
@@ -XXX,XX +XXX,XX @@ static const MemoryRegionOps nvme_mmio_ops = {
     },
 };
 
+static void nvme_cmb_write(void *opaque, hwaddr addr, uint64_t data,
+    unsigned size)
+{
+    NvmeCtrl *n = (NvmeCtrl *)opaque;
+    memcpy(&n->cmbuf[addr], &data, size);
+}
+
+static uint64_t nvme_cmb_read(void *opaque, hwaddr addr, unsigned size)
+{
+    uint64_t val;
+    NvmeCtrl *n = (NvmeCtrl *)opaque;
+
+    memcpy(&val, &n->cmbuf[addr], size);
+    return val;
+}
+
+static const MemoryRegionOps nvme_cmb_ops = {
+    .read = nvme_cmb_read,
+    .write = nvme_cmb_write,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+    .impl = {
+        .min_access_size = 2,
+        .max_access_size = 8,
+    },
+};
+
 static int nvme_init(PCIDevice *pci_dev)
 {
     NvmeCtrl *n = NVME(pci_dev);
@@ -XXX,XX +XXX,XX @@ static int nvme_init(PCIDevice *pci_dev)
     NVME_CAP_SET_CSS(n->bar.cap, 1);
     NVME_CAP_SET_MPSMAX(n->bar.cap, 4);
 
-    n->bar.vs = 0x00010100;
+    n->bar.vs = 0x00010200;
     n->bar.intmc = n->bar.intms = 0;
 
+    if (n->cmb_size_mb) {
+
+        NVME_CMBLOC_SET_BIR(n->bar.cmbloc, 2);
+        NVME_CMBLOC_SET_OFST(n->bar.cmbloc, 0);
+
+        NVME_CMBSZ_SET_SQS(n->bar.cmbsz, 1);
+        NVME_CMBSZ_SET_CQS(n->bar.cmbsz, 0);
+        NVME_CMBSZ_SET_LISTS(n->bar.cmbsz, 0);
+        NVME_CMBSZ_SET_RDS(n->bar.cmbsz, 0);
+        NVME_CMBSZ_SET_WDS(n->bar.cmbsz, 0);
+        NVME_CMBSZ_SET_SZU(n->bar.cmbsz, 2); /* MBs */
+        NVME_CMBSZ_SET_SZ(n->bar.cmbsz, n->cmb_size_mb);
+
+        n->cmbuf = g_malloc0(NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
+        memory_region_init_io(&n->ctrl_mem, OBJECT(n), &nvme_cmb_ops, n,
+                              "nvme-cmb", NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
+        pci_register_bar(&n->parent_obj, NVME_CMBLOC_BIR(n->bar.cmbloc),
+            PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64 |
+            PCI_BASE_ADDRESS_MEM_PREFETCH, &n->ctrl_mem);
+
+    }
+
     for (i = 0; i < n->num_namespaces; i++) {
         NvmeNamespace *ns = &n->namespaces[i];
         NvmeIdNs *id_ns = &ns->id_ns;
@@ -XXX,XX +XXX,XX @@ static void nvme_exit(PCIDevice *pci_dev)
     g_free(n->namespaces);
     g_free(n->cq);
     g_free(n->sq);
+    if (n->cmbsz) {
+        memory_region_unref(&n->ctrl_mem);
+    }
+
     msix_uninit_exclusive_bar(pci_dev);
 }
 
 static Property nvme_props[] = {
     DEFINE_BLOCK_PROPERTIES(NvmeCtrl, conf),
     DEFINE_PROP_STRING("serial", NvmeCtrl, serial),
+    DEFINE_PROP_UINT32("cmb_size_mb", NvmeCtrl, cmb_size_mb, 0),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -XXX,XX +XXX,XX @@ typedef struct NvmeBar {
     uint32_t    aqa;
     uint64_t    asq;
     uint64_t    acq;
+    uint32_t    cmbloc;
+    uint32_t    cmbsz;
 } NvmeBar;
 
 enum NvmeCapShift {
@@ -XXX,XX +XXX,XX @@ enum NvmeAqaMask {
 #define NVME_AQA_ASQS(aqa) ((aqa >> AQA_ASQS_SHIFT) & AQA_ASQS_MASK)
 #define NVME_AQA_ACQS(aqa) ((aqa >> AQA_ACQS_SHIFT) & AQA_ACQS_MASK)
 
+enum NvmeCmblocShift {
+    CMBLOC_BIR_SHIFT  = 0,
+    CMBLOC_OFST_SHIFT = 12,
+};
+
+enum NvmeCmblocMask {
+    CMBLOC_BIR_MASK  = 0x7,
+    CMBLOC_OFST_MASK = 0xfffff,
+};
+
+#define NVME_CMBLOC_BIR(cmbloc) ((cmbloc >> CMBLOC_BIR_SHIFT)  & \
+                                 CMBLOC_BIR_MASK)
+#define NVME_CMBLOC_OFST(cmbloc)((cmbloc >> CMBLOC_OFST_SHIFT) & \
+                                 CMBLOC_OFST_MASK)
+
+#define NVME_CMBLOC_SET_BIR(cmbloc, val)  \
+    (cmbloc |= (uint64_t)(val & CMBLOC_BIR_MASK) << CMBLOC_BIR_SHIFT)
+#define NVME_CMBLOC_SET_OFST(cmbloc, val) \
+    (cmbloc |= (uint64_t)(val & CMBLOC_OFST_MASK) << CMBLOC_OFST_SHIFT)
+
+enum NvmeCmbszShift {
+    CMBSZ_SQS_SHIFT   = 0,
+    CMBSZ_CQS_SHIFT   = 1,
+    CMBSZ_LISTS_SHIFT = 2,
+    CMBSZ_RDS_SHIFT   = 3,
+    CMBSZ_WDS_SHIFT   = 4,
+    CMBSZ_SZU_SHIFT   = 8,
+    CMBSZ_SZ_SHIFT    = 12,
+};
+
+enum NvmeCmbszMask {
+    CMBSZ_SQS_MASK   = 0x1,
+    CMBSZ_CQS_MASK   = 0x1,
+    CMBSZ_LISTS_MASK = 0x1,
+    CMBSZ_RDS_MASK   = 0x1,
+    CMBSZ_WDS_MASK   = 0x1,
+    CMBSZ_SZU_MASK   = 0xf,
+    CMBSZ_SZ_MASK    = 0xfffff,
+};
+
+#define NVME_CMBSZ_SQS(cmbsz)  ((cmbsz >> CMBSZ_SQS_SHIFT)   & CMBSZ_SQS_MASK)
+#define NVME_CMBSZ_CQS(cmbsz)  ((cmbsz >> CMBSZ_CQS_SHIFT)   & CMBSZ_CQS_MASK)
+#define NVME_CMBSZ_LISTS(cmbsz)((cmbsz >> CMBSZ_LISTS_SHIFT) & CMBSZ_LISTS_MASK)
+#define NVME_CMBSZ_RDS(cmbsz)  ((cmbsz >> CMBSZ_RDS_SHIFT)   & CMBSZ_RDS_MASK)
+#define NVME_CMBSZ_WDS(cmbsz)  ((cmbsz >> CMBSZ_WDS_SHIFT)   & CMBSZ_WDS_MASK)
+#define NVME_CMBSZ_SZU(cmbsz)  ((cmbsz >> CMBSZ_SZU_SHIFT)   & CMBSZ_SZU_MASK)
+#define NVME_CMBSZ_SZ(cmbsz)   ((cmbsz >> CMBSZ_SZ_SHIFT)    & CMBSZ_SZ_MASK)
+
+#define NVME_CMBSZ_SET_SQS(cmbsz, val)   \
+    (cmbsz |= (uint64_t)(val &  CMBSZ_SQS_MASK)  << CMBSZ_SQS_SHIFT)
+#define NVME_CMBSZ_SET_CQS(cmbsz, val)   \
+    (cmbsz |= (uint64_t)(val & CMBSZ_CQS_MASK) << CMBSZ_CQS_SHIFT)
+#define NVME_CMBSZ_SET_LISTS(cmbsz, val) \
+    (cmbsz |= (uint64_t)(val & CMBSZ_LISTS_MASK) << CMBSZ_LISTS_SHIFT)
+#define NVME_CMBSZ_SET_RDS(cmbsz, val)   \
+    (cmbsz |= (uint64_t)(val & CMBSZ_RDS_MASK) << CMBSZ_RDS_SHIFT)
+#define NVME_CMBSZ_SET_WDS(cmbsz, val)   \
+    (cmbsz |= (uint64_t)(val & CMBSZ_WDS_MASK) << CMBSZ_WDS_SHIFT)
+#define NVME_CMBSZ_SET_SZU(cmbsz, val)   \
+    (cmbsz |= (uint64_t)(val & CMBSZ_SZU_MASK) << CMBSZ_SZU_SHIFT)
+#define NVME_CMBSZ_SET_SZ(cmbsz, val)    \
+    (cmbsz |= (uint64_t)(val & CMBSZ_SZ_MASK) << CMBSZ_SZ_SHIFT)
+
+#define NVME_CMBSZ_GETSIZE(cmbsz) \
+    (NVME_CMBSZ_SZ(cmbsz) * (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz))))
+
 typedef struct NvmeCmd {
     uint8_t     opcode;
     uint8_t     fuse;
@@ -XXX,XX +XXX,XX @@ typedef struct NvmeNamespace {
 typedef struct NvmeCtrl {
     PCIDevice    parent_obj;
     MemoryRegion iomem;
+    MemoryRegion ctrl_mem;
     NvmeBar      bar;
     BlockConf    conf;
 
@@ -XXX,XX +XXX,XX @@ typedef struct NvmeCtrl {
     uint32_t    num_queues;
     uint32_t    max_q_ents;
     uint64_t    ns_size;
+    uint32_t    cmb_size_mb;
+    uint32_t    cmbsz;
+    uint32_t    cmbloc;
+    uint8_t     *cmbuf;
 
     char            *serial;
     NvmeNamespace   *namespaces;
-- 
1.8.3.1

This fixes an assertion failure that was triggered by qemu-iotests 129
on some CI host, while the same test case didn't seem to fail on other
hosts.

Essentially the problem is that the blk_unref(s->target) in
mirror_exit() doesn't necessarily mean that the BlockBackend goes away
immediately. It is possible that the job completion was triggered nested
in mirror_drain(), which looks like this:

BlockBackend *target = s->target;
    blk_ref(target);
    blk_drain(target);
    blk_unref(target);

In this case, the write permissions for s->target are retained until
after blk_drain(), which makes removing mirror_top_bs fail for the
active commit case (can't have a writable backing file in the chain
without the filter driver).

Explicitly dropping the permissions first means that the additional
reference doesn't hurt and the job can complete successfully even if
called from the nested blk_drain().

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 block/mirror.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/block/mirror.c b/block/mirror.c
index XXXXXXX..XXXXXXX 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -XXX,XX +XXX,XX @@ static void mirror_exit(BlockJob *job, void *opaque)
 
     /* Remove target parent that still uses BLK_PERM_WRITE/RESIZE before
      * inserting target_bs at s->to_replace, where we might not be able to get
-     * these permissions. */
+     * these permissions.
+     *
+     * Note that blk_unref() alone doesn't necessarily drop permissions because
+     * we might be running nested inside mirror_drain(), which takes an extra
+     * reference, so use an explicit blk_set_perm() first. */
+    blk_set_perm(s->target, 0, BLK_PERM_ALL, &error_abort);
     blk_unref(s->target);
     s->target = NULL;
 
-- 
1.8.3.1

From: Alberto Garcia <berto@igalia.com>

Commit d7086422b1c1e75e320519cfe26176db6ec97a37 added a local_err
variable global to the qcow2_amend_options() function, so there's no
need to have this other one.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-id: 20170511150337.21470-1-berto@igalia.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
 
     if (s->refcount_bits != refcount_bits) {
         int refcount_order = ctz32(refcount_bits);
-        Error *local_error = NULL;
 
         if (new_version < 3 && refcount_bits != 16) {
             error_report("Different refcount widths than 16 bits require "
@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
         helper_cb_info.current_operation = QCOW2_CHANGING_REFCOUNT_ORDER;
         ret = qcow2_change_refcount_order(bs, refcount_order,
                                           &qcow2_amend_helper_cb,
-                                          &helper_cb_info, &local_error);
+                                          &helper_cb_info, &local_err);
         if (ret < 0) {
-            error_report_err(local_error);
+            error_report_err(local_err);
             return ret;
         }
     }
-- 
1.8.3.1

From: Fam Zheng <famz@redhat.com>

It got lost in commit a8d16f9ca "qemu-img: Update documentation for -U".

Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-id: 20170515103551.31313-1-famz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qemu-img-cmds.hx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

From: "Daniel P. Berrange" <berrange@redhat.com>

The qemu-img dd command added --image-opts support, but missed
the corresponding --object support. This prevented passing
secrets (eg auth passwords) needed by certain disk images.

Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170515164712.6643-2-berrange@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qemu-img.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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_dd(int argc, char **argv)
     };
     const struct option long_options[] = {
         { "help", no_argument, 0, 'h'},
+        { "object", required_argument, 0, OPTION_OBJECT},
         { "image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
         { "force-share", no_argument, 0, 'U'},
         { 0, 0, 0, 0 }
@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)
         case 'U':
             force_share = true;
             break;
+        case OPTION_OBJECT: {
+            QemuOpts *opts;
+            opts = qemu_opts_parse_noisily(&qemu_object_opts,
+                                           optarg, true);
+            if (!opts) {
+                ret = -1;
+                goto out;
+            }
+        }   break;
         case OPTION_IMAGE_OPTS:
             image_opts = true;
             break;
@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)
         ret = -1;
         goto out;
     }
+
+    if (qemu_opts_foreach(&qemu_object_opts,
+                          user_creatable_add_opts_foreach,
+                          NULL, NULL)) {
+        ret = -1;
+        goto out;
+    }
+
     blk1 = img_open(image_opts, in.filename, fmt, 0, false, false,
                     force_share);
 
-- 
1.8.3.1

From: "Daniel P. Berrange" <berrange@redhat.com>

The --image-opts flag can only be used to affect the parsing
of the source image. The target image has to be specified in
the traditional style regardless, since it needs to be passed
to the bdrv_create() API which does not support the new style
opts.

Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170515164712.6643-3-berrange@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qemu-img.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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_dd(int argc, char **argv)
         goto out;
     }
 
-    blk2 = img_open(image_opts, out.filename, out_fmt, BDRV_O_RDWR,
-                    false, false, false);
+    /* TODO, we can't honour --image-opts for the target,
+     * since it needs to be given in a format compatible
+     * with the bdrv_create() call above which does not
+     * support image-opts style.
+     */
+    blk2 = img_open_file(out.filename, out_fmt, BDRV_O_RDWR,
+                         false, false, false);
 
     if (!blk2) {
         ret = -1;
-- 
1.8.3.1

From: "Daniel P. Berrange" <berrange@redhat.com>

The '--image-opts' flag indicates whether the source filename
includes options. The target filename has to remain in the
plain filename format though, since it needs to be passed to
bdrv_create().  When using --skip-create though, it would be
possible to use image-opts syntax. This adds --target-image-opts
to indicate that the target filename includes options. Currently
this mandates use of the --skip-create flag too.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170515164712.6643-4-berrange@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qemu-img-cmds.hx |  4 +--
 qemu-img.c       | 84 ++++++++++++++++++++++++++++++++++++++------------------
 qemu-img.texi    | 12 ++++++--
 3 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img-cmds.hx
+++ b/qemu-img-cmds.hx
@@ -XXX,XX +XXX,XX @@ STEXI
 ETEXI
 
 DEF("convert", img_convert,
-    "convert [--object objectdef] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")
+    "convert [--object objectdef] [--image-opts] [--target-image-opts] [-U] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")
 STEXI
-@item convert [--object @var{objectdef}] [--image-opts] [-U] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}
+@item convert [--object @var{objectdef}] [--image-opts] [--target-image-opts] [-U] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}
 ETEXI
 
 DEF("dd", img_dd,
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 @@ enum {
     OPTION_PATTERN = 260,
     OPTION_FLUSH_INTERVAL = 261,
     OPTION_NO_DRAIN = 262,
+    OPTION_TARGET_IMAGE_OPTS = 263,
 };
 
 typedef enum OutputFormat {
@@ -XXX,XX +XXX,XX @@ static int convert_do_copy(ImgConvertState *s)
 static int img_convert(int argc, char **argv)
 {
     int c, bs_i, flags, src_flags = 0;
-    const char *fmt = NULL, *out_fmt = "raw", *cache = "unsafe",
+    const char *fmt = NULL, *out_fmt = NULL, *cache = "unsafe",
                *src_cache = BDRV_DEFAULT_CACHE, *out_baseimg = NULL,
                *out_filename, *out_baseimg_param, *snapshot_name = NULL;
-    BlockDriver *drv, *proto_drv;
+    BlockDriver *drv = NULL, *proto_drv = NULL;
     BlockDriverInfo bdi;
     BlockDriverState *out_bs;
     QemuOpts *opts = NULL, *sn_opts = NULL;
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
     char *options = NULL;
     Error *local_err = NULL;
     bool writethrough, src_writethrough, quiet = false, image_opts = false,
-         skip_create = false, progress = false;
+         skip_create = false, progress = false, tgt_image_opts = false;
     int64_t ret = -EINVAL;
     bool force_share = false;
 
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"force-share", no_argument, 0, 'U'},
+            {"target-image-opts", no_argument, 0, OPTION_TARGET_IMAGE_OPTS},
             {0, 0, 0, 0}
         };
         c = getopt_long(argc, argv, ":hf:O:B:ce6o:s:l:S:pt:T:qnm:WU",
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
         case OPTION_IMAGE_OPTS:
             image_opts = true;
             break;
+        case OPTION_TARGET_IMAGE_OPTS:
+            tgt_image_opts = true;
+            break;
         }
     }
 
+    if (!out_fmt && !tgt_image_opts) {
+        out_fmt = "raw";
+    }
+
     if (qemu_opts_foreach(&qemu_object_opts,
                           user_creatable_add_opts_foreach,
                           NULL, NULL)) {
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
         goto fail_getopt;
     }
 
+    if (tgt_image_opts && !skip_create) {
+        error_report("--target-image-opts requires use of -n flag");
+        goto fail_getopt;
+    }
+
     s.src_num = argc - optind - 1;
     out_filename = s.src_num >= 1 ? argv[argc - 1] : NULL;
 
     if (options && has_help_option(options)) {
-        ret = print_block_option_help(out_filename, out_fmt);
-        goto fail_getopt;
+        if (out_fmt) {
+            ret = print_block_option_help(out_filename, out_fmt);
+            goto fail_getopt;
+        } else {
+            error_report("Option help requires a format be specified");
+            goto fail_getopt;
+        }
     }
 
     if (s.src_num < 1) {
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
         goto out;
     }
 
-    /* Find driver and parse its options */
-    drv = bdrv_find_format(out_fmt);
-    if (!drv) {
-        error_report("Unknown file format '%s'", out_fmt);
-        ret = -1;
-        goto out;
-    }
+    if (!skip_create) {
+        /* Find driver and parse its options */
+        drv = bdrv_find_format(out_fmt);
+        if (!drv) {
+            error_report("Unknown file format '%s'", out_fmt);
+            ret = -1;
+            goto out;
+        }
 
-    proto_drv = bdrv_find_protocol(out_filename, true, &local_err);
-    if (!proto_drv) {
-        error_report_err(local_err);
-        ret = -1;
-        goto out;
-    }
+        proto_drv = bdrv_find_protocol(out_filename, true, &local_err);
+        if (!proto_drv) {
+            error_report_err(local_err);
+            ret = -1;
+            goto out;
+        }
 
-    if (!skip_create) {
         if (!drv->create_opts) {
             error_report("Format driver '%s' does not support image creation",
                          drv->format_name);
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
         const char *preallocation =
             qemu_opt_get(opts, BLOCK_OPT_PREALLOC);
 
-        if (!drv->bdrv_co_pwritev_compressed) {
+        if (drv && !drv->bdrv_co_pwritev_compressed) {
             error_report("Compression not supported for this file format");
             ret = -1;
             goto out;
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
         goto out;
     }
 
-    /* XXX we should allow --image-opts to trigger use of
-     * img_open() here, but then we have trouble with
-     * the bdrv_create() call which takes different params.
-     * Not critical right now, so fix can wait...
-     */
-    s.target = img_open_file(out_filename, out_fmt, flags, writethrough, quiet,
-                             false);
+    if (skip_create) {
+        s.target = img_open(tgt_image_opts, out_filename, out_fmt,
+                            flags, writethrough, quiet, false);
+    } else {
+        /* TODO ultimately we should allow --target-image-opts
+         * to be used even when -n is not given.
+         * That has to wait for bdrv_create to be improved
+         * to allow filenames in option syntax
+         */
+        s.target = img_open_file(out_filename, out_fmt, flags,
+                                 writethrough, quiet, false);
+    }
     if (!s.target) {
         ret = -1;
         goto out;
     }
     out_bs = blk_bs(s.target);
 
+    if (s.compressed && !out_bs->drv->bdrv_co_pwritev_compressed) {
+        error_report("Compression not supported for this file format");
+        ret = -1;
+        goto out;
+    }
+
     /* increase bufsectors from the default 4096 (2M) if opt_transfer
      * or discard_alignment of the out_bs is greater. Limit to 32768 (16MB)
      * as maximum. */
diff --git a/qemu-img.texi b/qemu-img.texi
index XXXXXXX..XXXXXXX 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -XXX,XX +XXX,XX @@ keys.
 
 @item --image-opts
 
-Indicates that the @var{filename} parameter is to be interpreted as a
+Indicates that the source @var{filename} parameter is to be interpreted as a
 full option string, not a plain filename. This parameter is mutually
-exclusive with the @var{-f} and @var{-F} parameters.
+exclusive with the @var{-f} parameter.
+
+@item --target-image-opts
+
+Indicates that the @var{output_filename} parameter(s) are to be interpreted as
+a full option string, not a plain filename. This parameter is mutually
+exclusive with the @var{-O} parameters. It is currently required to also use
+the @var{-n} parameter to skip image creation. This restriction may be relaxed
+in a future release.
 
 @item fmt
 is the disk image format. It is guessed automatically in most cases. See below
-- 
1.8.3.1

From: "Daniel P. Berrange" <berrange@redhat.com>

The qemu-img dd/convert commands will create an image file and
then try to open it. Historically it has been possible to open
new files without passing any options. With encrypted files
though, the *key-secret options are mandatory, so we need to
provide those options when opening the newly created file.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170515164712.6643-5-berrange@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 qemu-img.c | 42 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

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 BlockBackend *img_open_opts(const char *optstr,
 }
 
 static BlockBackend *img_open_file(const char *filename,
+                                   QDict *options,
                                    const char *fmt, int flags,
                                    bool writethrough, bool quiet,
                                    bool force_share)
 {
     BlockBackend *blk;
     Error *local_err = NULL;
-    QDict *options = qdict_new();
 
+    if (!options) {
+        options = qdict_new();
+    }
     if (fmt) {
         qdict_put_str(options, "driver", fmt);
     }
@@ -XXX,XX +XXX,XX @@ static BlockBackend *img_open_file(const char *filename,
 }
 
 
+static int img_add_key_secrets(void *opaque,
+                               const char *name, const char *value,
+                               Error **errp)
+{
+    QDict *options = opaque;
+
+    if (g_str_has_suffix(name, "key-secret")) {
+        qdict_put(options, name, qstring_from_str(value));
+    }
+
+    return 0;
+}
+
+static BlockBackend *img_open_new_file(const char *filename,
+                                       QemuOpts *create_opts,
+                                       const char *fmt, int flags,
+                                       bool writethrough, bool quiet,
+                                       bool force_share)
+{
+    QDict *options = NULL;
+
+    options = qdict_new();
+    qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abort);
+
+    return img_open_file(filename, options, fmt, flags, writethrough, quiet,
+                         force_share);
+}
+
+
 static BlockBackend *img_open(bool image_opts,
                               const char *filename,
                               const char *fmt, int flags, bool writethrough,
@@ -XXX,XX +XXX,XX @@ static BlockBackend *img_open(bool image_opts,
         blk = img_open_opts(filename, opts, flags, writethrough, quiet,
                             force_share);
     } else {
-        blk = img_open_file(filename, fmt, flags, writethrough, quiet,
+        blk = img_open_file(filename, NULL, fmt, flags, writethrough, quiet,
                             force_share);
     }
     return blk;
@@ -XXX,XX +XXX,XX @@ static int img_convert(int argc, char **argv)
          * That has to wait for bdrv_create to be improved
          * to allow filenames in option syntax
          */
-        s.target = img_open_file(out_filename, out_fmt, flags,
-                                 writethrough, quiet, false);
+        s.target = img_open_new_file(out_filename, opts, out_fmt,
+                                     flags, writethrough, quiet, false);
     }
     if (!s.target) {
         ret = -1;
@@ -XXX,XX +XXX,XX @@ static int img_dd(int argc, char **argv)
      * with the bdrv_create() call above which does not
      * support image-opts style.
      */
-    blk2 = img_open_file(out.filename, out_fmt, BDRV_O_RDWR,
+    blk2 = img_open_file(out.filename, NULL, out_fmt, BDRV_O_RDWR,
                          false, false, false);
 
     if (!blk2) {
-- 
1.8.3.1

From: Eric Blake <eblake@redhat.com>

When converting a 1.1 image down to 0.10, qemu-iotests 060 forces
a contrived failure where allocating a cluster used to replace a
zero cluster reads unaligned data.  Since it is a zero cluster
rather than a data cluster being converted, changing the error
message to match our earlier change in 'qcow2: Make distinction
between zero cluster types obvious' is worthwhile.

Suggested-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-id: 20170508171302.17805-1-eblake@redhat.com
[mreitz: Commit message fixes]
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2-cluster.c      | 3 ++-
 tests/qemu-iotests/060.out | 2 +-
 2 files changed, 3 insertions(+), 2 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 int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
             }
 
             if (offset_into_cluster(s, offset)) {
-                qcow2_signal_corruption(bs, true, -1, -1, "Data cluster offset "
+                qcow2_signal_corruption(bs, true, -1, -1,
+                                        "Cluster allocation offset "
                                         "%#" PRIx64 " unaligned (L2 offset: %#"
                                         PRIx64 ", L2 index: %#x)", offset,
                                         l2_offset, j);
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/060.out
+++ b/tests/qemu-iotests/060.out
@@ -XXX,XX +XXX,XX @@ read failed: Input/output error
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 65536/65536 bytes at offset 0
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-qcow2: Marking image as corrupt: Data cluster offset 0x52a00 unaligned (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+qcow2: Marking image as corrupt: Cluster allocation offset 0x52a00 unaligned (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
 qemu-img: Error while amending options: Input/output error
 
 === Testing unaligned reftable entry ===
-- 
1.8.3.1

From: Max Reitz <mreitz@redhat.com>

path_combine() naturally tries to preserve a protocol prefix. However,
it recognizes such a prefix by scanning for the first colon; which is
different from what path_has_protocol() does: There only is a protocol
prefix if there is a colon before the first slash.

A protocol prefix that is not recognized by path_has_protocol() is none,
and should thus not be taken as one.

Case in point, before this patch:
$ ./qemu-img create -f qcow2 -b backing.qcow2 ./top:image.qcow2
qemu-img: ./top:image.qcow2: Could not open './top:backing.qcow2':
    No such file or directory

Afterwards:
$ ./qemu-img create -f qcow2 -b backing.qcow2 ./top:image.qcow2
qemu-img: ./top:image.qcow2: Could not open './backing.qcow2':
    No such file or directory

Reported-by: yangyang <yangyang@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20170522195217.12991-2-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c | 15 ++++++++++-----
 1 file changed, 10 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,
     if (path_is_absolute(filename)) {
         pstrcpy(dest, dest_size, filename);
     } else {
-        p = strchr(base_path, ':');
-        if (p)
-            p++;
-        else
-            p = base_path;
+        const char *protocol_stripped = NULL;
+
+        if (path_has_protocol(base_path)) {
+            protocol_stripped = strchr(base_path, ':');
+            if (protocol_stripped) {
+                protocol_stripped++;
+            }
+        }
+        p = protocol_stripped ?: base_path;
+
         p1 = strrchr(base_path, '/');
 #ifdef _WIN32
         {
-- 
1.8.3.1

From: Max Reitz <mreitz@redhat.com>

The file drivers' *_parse_filename() implementations just strip the
optional protocol prefix off the filename. However, for e.g.
"file:foo:bar", this would lead to "foo:bar" being stored as the BDS's
filename which looks like it should be managed using the "foo" protocol.
This is especially troublesome if you then try to resolve a backing
filename based on "foo:bar".

This issue can only occur if the stripped part is a relative filename
("file:/foo:bar" will be shortened to "/foo:bar" and having a slash
before the first colon means that "/foo" is not recognized as a protocol
part). Therefore, we can easily fix it by prepending "./" to such
filenames.

Before this patch:
$ ./qemu-img create -f qcow2 backing.qcow2 64M
Formatting 'backing.qcow2', fmt=qcow2 size=67108864 encryption=off
    cluster_size=65536 lazy_refcounts=off refcount_bits=16
$ ./qemu-img create -f qcow2 -b backing.qcow2 file:top:image.qcow2
Formatting 'file:top:image.qcow2', fmt=qcow2 size=67108864
    backing_file=backing.qcow2 encryption=off cluster_size=65536
    lazy_refcounts=off refcount_bits=16
$ ./qemu-io file:top:image.qcow2
can't open device file:top:image.qcow2: Could not open backing file:
    Unknown protocol 'top'

After this patch:
$ ./qemu-io file:top:image.qcow2
[no error]

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20170522195217.12991-3-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c                   | 35 +++++++++++++++++++++++++++++++++++
 block/file-posix.c        | 17 +++--------------
 block/file-win32.c        | 12 ++----------
 include/block/block_int.h |  3 +++
 4 files changed, 43 insertions(+), 24 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,
     }
 }
 
+/*
+ * Helper function for bdrv_parse_filename() implementations to remove optional
+ * protocol prefixes (especially "file:") from a filename and for putting the
+ * stripped filename into the options QDict if there is such a prefix.
+ */
+void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,
+                                      QDict *options)
+{
+    if (strstart(filename, prefix, &filename)) {
+        /* Stripping the explicit protocol prefix may result in a protocol
+         * prefix being (wrongly) detected (if the filename contains a colon) */
+        if (path_has_protocol(filename)) {
+            QString *fat_filename;
+
+            /* This means there is some colon before the first slash; therefore,
+             * this cannot be an absolute path */
+            assert(!path_is_absolute(filename));
+
+            /* And we can thus fix the protocol detection issue by prefixing it
+             * by "./" */
+            fat_filename = qstring_from_str("./");
+            qstring_append(fat_filename, filename);
+
+            assert(!path_has_protocol(qstring_get_str(fat_filename)));
+
+            qdict_put(options, "filename", fat_filename);
+        } else {
+            /* If no protocol prefix was detected, we can use the shortened
+             * filename as-is */
+            qdict_put_str(options, "filename", filename);
+        }
+    }
+}
+
+
 /* Returns whether the image file is opened as read-only. Note that this can
  * return false and writing to the image file is still not possible because the
  * image is inactivated. */
diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static void raw_parse_flags(int bdrv_flags, int *open_flags)
 static void raw_parse_filename(const char *filename, QDict *options,
                                Error **errp)
 {
-    /* The filename does not have to be prefixed by the protocol name, since
-     * "file" is the default protocol; therefore, the return value of this
-     * function call can be ignored. */
-    strstart(filename, "file:", &filename);
-
-    qdict_put_str(options, "filename", filename);
+    bdrv_parse_filename_strip_prefix(filename, "file:", options);
 }
 
 static QemuOptsList raw_runtime_opts = {
@@ -XXX,XX +XXX,XX @@ static int check_hdev_writable(BDRVRawState *s)
 static void hdev_parse_filename(const char *filename, QDict *options,
                                 Error **errp)
 {
-    /* The prefix is optional, just as for "file". */
-    strstart(filename, "host_device:", &filename);
-
-    qdict_put_str(options, "filename", filename);
+    bdrv_parse_filename_strip_prefix(filename, "host_device:", options);
 }
 
 static bool hdev_is_sg(BlockDriverState *bs)
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
 static void cdrom_parse_filename(const char *filename, QDict *options,
                                  Error **errp)
 {
-    /* The prefix is optional, just as for "file". */
-    strstart(filename, "host_cdrom:", &filename);
-
-    qdict_put_str(options, "filename", filename);
+    bdrv_parse_filename_strip_prefix(filename, "host_cdrom:", options);
 }
 #endif
 
diff --git a/block/file-win32.c b/block/file-win32.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -XXX,XX +XXX,XX @@ static void raw_parse_flags(int flags, bool use_aio, int *access_flags,
 static void raw_parse_filename(const char *filename, QDict *options,
                                Error **errp)
 {
-    /* The filename does not have to be prefixed by the protocol name, since
-     * "file" is the default protocol; therefore, the return value of this
-     * function call can be ignored. */
-    strstart(filename, "file:", &filename);
-
-    qdict_put_str(options, "filename", filename);
+    bdrv_parse_filename_strip_prefix(filename, "file:", options);
 }
 
 static QemuOptsList raw_runtime_opts = {
@@ -XXX,XX +XXX,XX @@ static int hdev_probe_device(const char *filename)
 static void hdev_parse_filename(const char *filename, QDict *options,
                                 Error **errp)
 {
-    /* The prefix is optional, just as for "file". */
-    strstart(filename, "host_device:", &filename);
-
-    qdict_put_str(options, "filename", filename);
+    bdrv_parse_filename_strip_prefix(filename, "host_device:", options);
 }
 
 static int hdev_open(BlockDriverState *bs, QDict *options, int flags,
diff --git a/include/block/block_int.h b/include/block/block_int.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -XXX,XX +XXX,XX @@ int get_tmp_filename(char *filename, int size);
 BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,
                             const char *filename);
 
+void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,
+                                      QDict *options);
+
 
 /**
  * bdrv_add_before_write_notifier:
-- 
1.8.3.1

The following changes since commit 7f21573c822805a8e6be379d9bcf3ad9effef3dc:

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-10-01' into staging (2019-10-01 13:13:38 +0100)

are available in the Git repository at:

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 352492e5541e293ea8117412ffd171ce1c7ac15d:

iotests: Remove Python 2 compatibility code (2019-10-02 16:47:23 +0200)

----------------------------------------------------------------
Block layer patches:

- Fix internal snapshots with typical -blockdev setups
- iotests: Require Python 3.6 or later

----------------------------------------------------------------
Kevin Wolf (4):
      block/snapshot: Restrict set of snapshot nodes
      iotests: Test internal snapshots with -blockdev
      iotests: Require Python 3.6 or later
      iotests: Remove Python 2 compatibility code

block/snapshot.c                 |  26 ++++--
 tests/qemu-iotests/044           |   3 -
 tests/qemu-iotests/163           |   3 -
 tests/qemu-iotests/267           | 168 ++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/267.out       | 182 +++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/check         |  13 ++-
 tests/qemu-iotests/common.filter |  11 ++-
 tests/qemu-iotests/group         |   1 +
 tests/qemu-iotests/iotests.py    |  13 +--
 9 files changed, 392 insertions(+), 28 deletions(-)
 create mode 100755 tests/qemu-iotests/267
 create mode 100644 tests/qemu-iotests/267.out

Nodes involved in internal snapshots were those that were returned by
bdrv_next(), inserted and not read-only. bdrv_next() in turn returns all
nodes that are either the root node of a BlockBackend or monitor-owned
nodes.

With the typical -drive use, this worked well enough. However, in the
typical -blockdev case, the user defines one node per option, making all
nodes monitor-owned nodes. This includes protocol nodes etc. which often
are not snapshottable, so "savevm" only returns an error.

Change the conditions so that internal snapshot still include all nodes
that have a BlockBackend attached (we definitely want to snapshot
anything attached to a guest device and probably also the built-in NBD
server; snapshotting block job BlockBackends is more of an accident, but
a preexisting one), but other monitor-owned nodes are only included if
they have no parents.

This makes internal snapshots usable again with typical -blockdev
configurations.

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Tested-by: Peter Krempa <pkrempa@redhat.com>
---
 block/snapshot.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/block/snapshot.c b/block/snapshot.c
index XXXXXXX..XXXXXXX 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -XXX,XX +XXX,XX @@
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/option.h"
+#include "sysemu/block-backend.h"
 
 QemuOptsList internal_snapshot_opts = {
     .name = "snapshot",
@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,
     return ret;
 }
 
+static bool bdrv_all_snapshots_includes_bs(BlockDriverState *bs)
+{
+    if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) {
+        return false;
+    }
+
+    /* Include all nodes that are either in use by a BlockBackend, or that
+     * aren't attached to any node, but owned by the monitor. */
+    return bdrv_has_blk(bs) || QLIST_EMPTY(&bs->parents);
+}
 
 /* Group operations. All block drivers are involved.
  * These functions will properly handle dataplane (take aio_context_acquire
@@ -XXX,XX +XXX,XX @@ bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs)
         AioContext *ctx = bdrv_get_aio_context(bs);
 
         aio_context_acquire(ctx);
-        if (bdrv_is_inserted(bs) && !bdrv_is_read_only(bs)) {
+        if (bdrv_all_snapshots_includes_bs(bs)) {
             ok = bdrv_can_snapshot(bs);
         }
         aio_context_release(ctx);
@@ -XXX,XX +XXX,XX @@ int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs,
         AioContext *ctx = bdrv_get_aio_context(bs);
 
         aio_context_acquire(ctx);
-        if (bdrv_can_snapshot(bs) &&
-                bdrv_snapshot_find(bs, snapshot, name) >= 0) {
+        if (bdrv_all_snapshots_includes_bs(bs) &&
+            bdrv_snapshot_find(bs, snapshot, name) >= 0)
+        {
             ret = bdrv_snapshot_delete(bs, snapshot->id_str,
                                        snapshot->name, err);
         }
@@ -XXX,XX +XXX,XX @@ int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs,
         AioContext *ctx = bdrv_get_aio_context(bs);
 
         aio_context_acquire(ctx);
-        if (bdrv_can_snapshot(bs)) {
+        if (bdrv_all_snapshots_includes_bs(bs)) {
             ret = bdrv_snapshot_goto(bs, name, errp);
         }
         aio_context_release(ctx);
@@ -XXX,XX +XXX,XX @@ int bdrv_all_find_snapshot(const char *name, BlockDriverState **first_bad_bs)
         AioContext *ctx = bdrv_get_aio_context(bs);
 
         aio_context_acquire(ctx);
-        if (bdrv_can_snapshot(bs)) {
+        if (bdrv_all_snapshots_includes_bs(bs)) {
             err = bdrv_snapshot_find(bs, &sn, name);
         }
         aio_context_release(ctx);
@@ -XXX,XX +XXX,XX @@ int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
         if (bs == vm_state_bs) {
             sn->vm_state_size = vm_state_size;
             err = bdrv_snapshot_create(bs, sn);
-        } else if (bdrv_can_snapshot(bs)) {
+        } else if (bdrv_all_snapshots_includes_bs(bs)) {
             sn->vm_state_size = 0;
             err = bdrv_snapshot_create(bs, sn);
         }
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_all_find_vmstate_bs(void)
         bool found;
 
         aio_context_acquire(ctx);
-        found = bdrv_can_snapshot(bs);
+        found = bdrv_all_snapshots_includes_bs(bs) && bdrv_can_snapshot(bs);
         aio_context_release(ctx);
 
         if (found) {
-- 
2.20.1

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Tested-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/qemu-iotests/267           | 168 ++++++++++++++++++++++++++++
 tests/qemu-iotests/267.out       | 182 +++++++++++++++++++++++++++++++
 tests/qemu-iotests/common.filter |  11 +-
 tests/qemu-iotests/group         |   1 +
 4 files changed, 358 insertions(+), 4 deletions(-)
 create mode 100755 tests/qemu-iotests/267
 create mode 100644 tests/qemu-iotests/267.out

diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
new file mode 100755
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/267
@@ -XXX,XX +XXX,XX @@
+#!/usr/bin/env bash
+#
+# Test which nodes are involved in internal snapshots
+#
+# 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=kwolf@redhat.com
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img
+    rm -f "$TEST_DIR/nbd"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_supported_fmt qcow2
+_supported_proto file
+_supported_os Linux
+
+# Internal snapshots are (currently) impossible with refcount_bits=1
+_unsupported_imgopts 'refcount_bits=1[^0-9]'
+
+do_run_qemu()
+{
+    echo Testing: "$@"
+    (
+        if ! test -t 0; then
+            while read cmd; do
+                echo $cmd
+            done
+        fi
+        echo quit
+    ) | $QEMU -nographic -monitor stdio -nodefaults "$@"
+    echo
+}
+
+run_qemu()
+{
+    do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp |
+        _filter_generated_node_ids | _filter_imgfmt | _filter_vmstate_size
+}
+
+size=128M
+
+run_test()
+{
+    _make_test_img $size
+    printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date
+}
+
+
+echo
+echo "=== No block devices at all ==="
+echo
+
+run_test
+
+echo
+echo "=== -drive if=none ==="
+echo
+
+run_test -drive driver=file,file="$TEST_IMG",if=none
+run_test -drive driver=$IMGFMT,file="$TEST_IMG",if=none
+run_test -drive driver=$IMGFMT,file="$TEST_IMG",if=none -device virtio-blk,drive=none0
+
+echo
+echo "=== -drive if=virtio ==="
+echo
+
+run_test -drive driver=file,file="$TEST_IMG",if=virtio
+run_test -drive driver=$IMGFMT,file="$TEST_IMG",if=virtio
+
+echo
+echo "=== Simple -blockdev ==="
+echo
+
+run_test -blockdev driver=file,filename="$TEST_IMG",node-name=file
+run_test -blockdev driver=file,filename="$TEST_IMG",node-name=file \
+         -blockdev driver=$IMGFMT,file=file,node-name=fmt
+run_test -blockdev driver=file,filename="$TEST_IMG",node-name=file \
+         -blockdev driver=raw,file=file,node-name=raw \
+         -blockdev driver=$IMGFMT,file=raw,node-name=fmt
+
+echo
+echo "=== -blockdev with a filter on top ==="
+echo
+
+run_test -blockdev driver=file,filename="$TEST_IMG",node-name=file \
+         -blockdev driver=$IMGFMT,file=file,node-name=fmt \
+         -blockdev driver=copy-on-read,file=fmt,node-name=filter
+
+echo
+echo "=== -blockdev with a backing file ==="
+echo
+
+TEST_IMG="$TEST_IMG.base" _make_test_img $size
+
+IMGOPTS="backing_file=$TEST_IMG.base" \
+run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
+         -blockdev driver=file,filename="$TEST_IMG",node-name=file \
+         -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt
+
+IMGOPTS="backing_file=$TEST_IMG.base" \
+run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
+         -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
+         -blockdev driver=file,filename="$TEST_IMG",node-name=file \
+         -blockdev driver=$IMGFMT,file=file,backing=backing-fmt,node-name=fmt
+
+# A snapshot should be present on the overlay, but not the backing file
+echo Internal snapshots on overlay:
+$QEMU_IMG snapshot -l "$TEST_IMG" | _filter_date | _filter_vmstate_size
+
+echo Internal snapshots on backing file:
+$QEMU_IMG snapshot -l "$TEST_IMG.base" | _filter_date | _filter_vmstate_size
+
+echo
+echo "=== -blockdev with NBD server on the backing file ==="
+echo
+
+IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
+cat <<EOF |
+nbd_server_start unix:$TEST_DIR/nbd
+nbd_server_add -w backing-fmt
+savevm snap0
+info snapshots
+loadvm snap0
+EOF
+run_qemu -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \
+         -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \
+         -blockdev driver=file,filename="$TEST_IMG",node-name=file \
+         -blockdev driver=$IMGFMT,file=file,backing=backing-fmt,node-name=fmt |
+         _filter_date
+
+# This time, a snapshot should be created on both files
+echo Internal snapshots on overlay:
+$QEMU_IMG snapshot -l "$TEST_IMG" | _filter_date | _filter_vmstate_size
+
+echo Internal snapshots on backing file:
+$QEMU_IMG snapshot -l "$TEST_IMG.base" | _filter_date | _filter_vmstate_size
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/267.out b/tests/qemu-iotests/267.out
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/tests/qemu-iotests/267.out
@@ -XXX,XX +XXX,XX @@
+QA output created by 267
+
+=== No block devices at all ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing:
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+Error: No block device can accept snapshots
+(qemu) info snapshots
+No available block device supports snapshots
+(qemu) loadvm snap0
+Error: No block device supports snapshots
+(qemu) quit
+
+
+=== -drive if=none ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+Error: Device 'none0' is writable but does not support snapshots
+(qemu) info snapshots
+No available block device supports snapshots
+(qemu) loadvm snap0
+Error: Device 'none0' is writable but does not support snapshots
+(qemu) quit
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=none
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=none -device virtio-blk,drive=none0
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+
+=== -drive if=virtio ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=virtio
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+Error: Device 'virtio0' is writable but does not support snapshots
+(qemu) info snapshots
+No available block device supports snapshots
+(qemu) loadvm snap0
+Error: Device 'virtio0' is writable but does not support snapshots
+(qemu) quit
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=virtio
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+
+=== Simple -blockdev ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+Error: Device '' is writable but does not support snapshots
+(qemu) info snapshots
+No available block device supports snapshots
+(qemu) loadvm snap0
+Error: Device '' is writable but does not support snapshots
+(qemu) quit
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,node-name=fmt
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=raw,file=file,node-name=raw -blockdev driver=IMGFMT,file=raw,node-name=fmt
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+
+=== -blockdev with a filter on top ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,node-name=fmt -blockdev driver=copy-on-read,file=fmt,node-name=filter
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+
+=== -blockdev with a backing file ===
+
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base
+Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-file,node-name=fmt
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base
+Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+Internal snapshots on overlay:
+Snapshot list:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+1         snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+Internal snapshots on backing file:
+
+=== -blockdev with NBD server on the backing file ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base
+Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) nbd_server_start unix:TEST_DIR/nbd
+(qemu) nbd_server_add -w backing-fmt
+(qemu) savevm snap0
+(qemu) info snapshots
+List of snapshots present on all disks:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+--        snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+(qemu) loadvm snap0
+(qemu) quit
+
+Internal snapshots on overlay:
+Snapshot list:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+1         snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+Internal snapshots on backing file:
+Snapshot list:
+ID        TAG                 VM SIZE                DATE       VM CLOCK
+1         snap0                  SIZE yyyy-mm-dd hh:mm:ss   00:00:00.000
+*** done
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 @@
 # standard filters
 #
 
-# ctime(3) dates
-#
 _filter_date()
 {
-    $SED \
-        -e 's/[A-Z][a-z][a-z] [A-z][a-z][a-z]  *[0-9][0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9][0-9][0-9][0-9]$/DATE/'
+    $SED -re 's/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/yyyy-mm-dd hh:mm:ss/'
+}
+
+_filter_vmstate_size()
+{
+    $SED -re 's/[0-9. ]{5} [KMGT]iB/     SIZE/' \
+         -re 's/[0-9. ]{5} B/   SIZE/'
 }
 
 _filter_generated_node_ids()
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 @@
 263 rw quick
 265 rw auto quick
 266 rw quick
+267 rw auto quick snapshot
-- 
2.20.1

Running iotests is not required to build QEMU, so we can have stricter
version requirements for Python here and can make use of new features
and drop compatibility code earlier.

This makes qemu-iotests skip all Python tests if a Python version before
3.6 is used for the build.

Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 tests/qemu-iotests/check | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 @@ then
     export SOCKET_SCM_HELPER="$build_iotests/socket_scm_helper"
 fi
 
+python_usable=false
+if $PYTHON -c 'import sys; sys.exit(0 if sys.version_info >= (3,6) else 1)'
+then
+    python_usable=true
+fi
+
 default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')
 default_alias_machine=$($QEMU_PROG -machine help | \
    sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }")
@@ -XXX,XX +XXX,XX @@ do
         start=$(_wallclock)
 
         if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python" ]; then
-            run_command="$PYTHON $seq"
+            if $python_usable; then
+                run_command="$PYTHON $seq"
+            else
+                run_command="false"
+                echo "Unsupported Python version" > $seq.notrun
+            fi
         else
             run_command="./$seq"
         fi
-- 
2.20.1

Some scripts check the Python version number and have two code paths to
accomodate both Python 2 and 3. Remove the code specific to Python 2 and
assert the minimum version of 3.6 instead (check skips Python tests in
this case, so the assertion would only ever trigger if a Python script
is executed manually).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 tests/qemu-iotests/044        |  3 ---
 tests/qemu-iotests/163        |  3 ---
 tests/qemu-iotests/iotests.py | 13 +++----------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/044
+++ b/tests/qemu-iotests/044
@@ -XXX,XX +XXX,XX @@ import struct
 import subprocess
 import sys
 
-if sys.version_info.major == 2:
-    range = xrange
-
 test_img = os.path.join(iotests.test_dir, 'test.img')
 
 class TestRefcountTableGrowth(iotests.QMPTestCase):
diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/163
+++ b/tests/qemu-iotests/163
@@ -XXX,XX +XXX,XX @@
 import os, random, iotests, struct, qcow2, sys
 from iotests import qemu_img, qemu_io, image_size
 
-if sys.version_info.major == 2:
-    range = xrange
-
 test_img = os.path.join(iotests.test_dir, 'test.img')
 check_img = os.path.join(iotests.test_dir, 'check.img')
 
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -XXX,XX +XXX,XX @@ from collections import OrderedDict
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
 from qemu import qtest
 
+assert sys.version_info >= (3,6)
 
 # This will not work if arguments contain spaces but is necessary if we
 # want to support the override options that ./check supports.
@@ -XXX,XX +XXX,XX @@ def image_size(img):
     return json.loads(r)['virtual-size']
 
 def is_str(val):
-    if sys.version_info.major >= 3:
-        return isinstance(val, str)
-    else:
-        return isinstance(val, str) or isinstance(val, unicode)
+    return isinstance(val, str)
 
 test_dir_re = re.compile(r"%s" % test_dir)
 def filter_test_dir(msg):
@@ -XXX,XX +XXX,XX @@ def execute_test(test_function=None,
     else:
         # We need to filter out the time taken from the output so that
         # qemu-iotest can reliably diff the results against master output.
-        if sys.version_info.major >= 3:
-            output = io.StringIO()
-        else:
-            # io.StringIO is for unicode strings, which is not what
-            # 2.x's test runner emits.
-            output = io.BytesIO()
+        output = io.StringIO()
 
     logging.basicConfig(level=(logging.DEBUG if debug else logging.WARN))
 
-- 
2.20.1