From 0e72078128229bf9efb542e396ab44bf91b91340 Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Thu, 17 Dec 2020 16:38:03 +0100

Subject: [PATCH] iotests: Fix _send_qemu_cmd with bash 5.1

With bash 5.1, the output of the following script changes:

  a=("double  space")

  a=${a[@]:0:1}

  echo "$a"

from "double space" to "double  space", i.e. all white space is

preserved as-is.  This is probably what we actually want here (judging

from the "...to accommodate pathnames with spaces" comment), but before

5.1, we would have to quote the ${} slice to get the same behavior.

In any case, without quoting, the reference output of many iotests is

different between bash 5.1 and pre-5.1, which is not very good.  The

output of 5.1 is what we want, so whatever we do to get pre-5.1 to the

same result, it means we have to fix the reference output of basically

all tests that invoke _send_qemu_cmd (except the ones that only use

single spaces in the commands they invoke).

Instead of quoting the ${} slice (cmd="${$@: 1:...}"), we can also just

not use array slicing and replace the whole thing with a simple "cmd=$1;

shift", which works because all callers quote the whole $cmd argument

anyway.

Signed-off-by: Max Reitz <mreitz@redhat.com>

Message-Id: <20201217153803.101231-3-mreitz@redhat.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

---

 tests/qemu-iotests/085.out     | 167 ++++++++++++++++++++++++++++-----

 tests/qemu-iotests/094.out     |  10 +-

 tests/qemu-iotests/095.out     |   4 +-

 tests/qemu-iotests/109.out     |  88 ++++++++++++-----

 tests/qemu-iotests/117.out     |  13 ++-

 tests/qemu-iotests/127.out     |  12 ++-

 tests/qemu-iotests/140.out     |  10 +-

 tests/qemu-iotests/141.out     | 128 +++++++++++++++++++------

 tests/qemu-iotests/143.out     |   4 +-

 tests/qemu-iotests/144.out     |  28 +++++-

 tests/qemu-iotests/153.out     |  18 ++--

 tests/qemu-iotests/156.out     |  39 ++++++--

 tests/qemu-iotests/161.out     |  18 +++-

 tests/qemu-iotests/173.out     |  25 ++++-

 tests/qemu-iotests/182.out     |  42 +++++++--

 tests/qemu-iotests/183.out     |  19 +++-

 tests/qemu-iotests/185.out     |  45 +++++++--

 tests/qemu-iotests/191.out     |  12 ++-

 tests/qemu-iotests/223.out     |  92 ++++++++++++------

 tests/qemu-iotests/229.out     |  13 ++-

 tests/qemu-iotests/249.out     |  16 +++-

 tests/qemu-iotests/common.qemu |  11 +--

 24 files changed, 728 insertions(+), 199 deletions(-)

diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out

index 7fc44b1c61..32a193f2c2 100644

--- a/tests/qemu-iotests/085.out

+++ b/tests/qemu-iotests/085.out

@@ -12,56 +12,135 @@ Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728

 === Create a single snapshot on virtio0 ===

-{ 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'virtio0', 'snapshot-file':'TEST_DIR/1-snapshot-v0.IMGFMT', 'format': 'IMGFMT' } }

+{ 'execute': 'blockdev-snapshot-sync',

+                      'arguments': { 'device': 'virtio0',

+                                     'snapshot-file':'TEST_DIR/1-snapshot-v0.IMGFMT',

+                                     'format': 'IMGFMT' } }

 Formatting 'TEST_DIR/1-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/t.qcow2.1 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

 === Invalid command - missing device and nodename ===

-{ 'execute': 'blockdev-snapshot-sync', 'arguments': { 'snapshot-file':'TEST_DIR/1-snapshot-v0.IMGFMT', 'format': 'IMGFMT' } }

+{ 'execute': 'blockdev-snapshot-sync',

+                         'arguments': { 'snapshot-file':'TEST_DIR/1-snapshot-v0.IMGFMT',

+                                     'format': 'IMGFMT' } }

 {"error": {"class": "GenericError", "desc": "Cannot find device= nor node_name="}}

 === Invalid command - missing snapshot-file ===

-{ 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'virtio0', 'format': 'IMGFMT' } }

+{ 'execute': 'blockdev-snapshot-sync',

+                         'arguments': { 'device': 'virtio0',

+                                     'format': 'IMGFMT' } }

 {"error": {"class": "GenericError", "desc": "Parameter 'snapshot-file' is missing"}}

 === Create several transactional group snapshots ===

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/2-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/2-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/2-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/2-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/2-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/1-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/2-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/t.qcow2.2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/3-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/3-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/3-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/3-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/3-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/2-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/3-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/2-snapshot-v1.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/4-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/4-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/4-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/4-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/4-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/3-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/4-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/3-snapshot-v1.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/5-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/5-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/5-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/5-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/5-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/4-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/5-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/4-snapshot-v1.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/6-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/6-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/6-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/6-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/6-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/5-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/6-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/5-snapshot-v1.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/7-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/7-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/7-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/7-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/7-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/6-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/7-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/6-snapshot-v1.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/8-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/8-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/8-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/8-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/8-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/7-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/8-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/7-snapshot-v1.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/9-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/9-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/9-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/9-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/9-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/8-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/9-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/8-snapshot-v1.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

-{ 'execute': 'transaction', 'arguments': {'actions': [ { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio0', 'snapshot-file': 'TEST_DIR/10-snapshot-v0.IMGFMT' } }, { 'type': 'blockdev-snapshot-sync', 'data' : { 'device': 'virtio1', 'snapshot-file': 'TEST_DIR/10-snapshot-v1.IMGFMT' } } ] } }

+{ 'execute': 'transaction', 'arguments':

+           {'actions': [

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio0',

+                      'snapshot-file': 'TEST_DIR/10-snapshot-v0.IMGFMT' } },

+               { 'type': 'blockdev-snapshot-sync', 'data' :

+                   { 'device': 'virtio1',

+                       'snapshot-file': 'TEST_DIR/10-snapshot-v1.IMGFMT' } } ]

+             } }

 Formatting 'TEST_DIR/10-snapshot-v0.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/9-snapshot-v0.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extended_l2=off compression_type=zlib size=134217728 backing_file=TEST_DIR/9-snapshot-v1.qcow2 backing_fmt=qcow2 lazy_refcounts=off refcount_bits=16

 {"return": {}}

@@ -69,48 +148,84 @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 cluster_size=65536 extende

 === Create a couple of snapshots using blockdev-snapshot ===

 Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT backing_fmt=IMGFMT

-{ 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_11', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/11-snapshot-v0.IMGFMT', 'node-name': 'file_11' } } }

+{ 'execute': 'blockdev-add', 'arguments':

+           { 'driver': 'IMGFMT', 'node-name': 'snap_11', 'backing': null,

+             'file':

+             { 'driver': 'file', 'filename': 'TEST_DIR/11-snapshot-v0.IMGFMT',

+               'node-name': 'file_11' } } }

 {"return": {}}

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_11' } }

+{ 'execute': 'blockdev-snapshot',

+                      'arguments': { 'node': 'virtio0',

+                                     'overlay':'snap_11' } }

 {"return": {}}

 Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT backing_fmt=IMGFMT

-{ 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_12', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/12-snapshot-v0.IMGFMT', 'node-name': 'file_12' } } }

+{ 'execute': 'blockdev-add', 'arguments':

+           { 'driver': 'IMGFMT', 'node-name': 'snap_12', 'backing': null,

+             'file':

+             { 'driver': 'file', 'filename': 'TEST_DIR/12-snapshot-v0.IMGFMT',

+               'node-name': 'file_12' } } }

 {"return": {}}

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_12' } }

+{ 'execute': 'blockdev-snapshot',

+                      'arguments': { 'node': 'virtio0',

+                                     'overlay':'snap_12' } }

 {"return": {}}

 === Invalid command - cannot create a snapshot using a file BDS ===

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node':'virtio0', 'overlay':'file_12' } }

+{ 'execute': 'blockdev-snapshot',

+                     'arguments': { 'node':'virtio0',

+                                    'overlay':'file_12' }

+                   }

 {"error": {"class": "GenericError", "desc": "The overlay is already in use"}}

 === Invalid command - snapshot node used as active layer ===

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_12' } }

+{ 'execute': 'blockdev-snapshot',

+                      'arguments': { 'node': 'virtio0',

+                                     'overlay':'snap_12' } }

 {"error": {"class": "GenericError", "desc": "The overlay is already in use"}}

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node':'virtio0', 'overlay':'virtio0' } }

+{ 'execute': 'blockdev-snapshot',

+                     'arguments': { 'node':'virtio0',

+                                    'overlay':'virtio0' }

+                   }

 {"error": {"class": "GenericError", "desc": "The overlay is already in use"}}

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node':'virtio0', 'overlay':'virtio1' } }

+{ 'execute': 'blockdev-snapshot',

+                     'arguments': { 'node':'virtio0',

+                                    'overlay':'virtio1' }

+                   }

 {"error": {"class": "GenericError", "desc": "The overlay is already in use"}}

 === Invalid command - snapshot node used as backing hd ===

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_11' } }

+{ 'execute': 'blockdev-snapshot',

+                      'arguments': { 'node': 'virtio0',

+                                     'overlay':'snap_11' } }

 {"error": {"class": "GenericError", "desc": "The overlay is already in use"}}

 === Invalid command - snapshot node has a backing image ===

 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 backing_fmt=IMGFMT

-{ 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_13', 'file': { 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'node-name': 'file_13' } } }

-{"return": {}}

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_13' } }

+{ 'execute': 'blockdev-add', 'arguments':

+           { 'driver': 'IMGFMT', 'node-name': 'snap_13',

+             'file':

+             { 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT',

+               'node-name': 'file_13' } } }

+{"return": {}}

+{ 'execute': 'blockdev-snapshot',

+                      'arguments': { 'node': 'virtio0',

+                                     'overlay':'snap_13' } }

 {"error": {"class": "GenericError", "desc": "The overlay already has a backing image"}}

 === Invalid command - The node does not exist ===

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_14' } }

+{ 'execute': 'blockdev-snapshot',

+                      'arguments': { 'node': 'virtio0',

+                                     'overlay':'snap_14' } }

 {"error": {"class": "GenericError", "desc": "Cannot find device=snap_14 nor node_name=snap_14"}}

-{ 'execute': 'blockdev-snapshot', 'arguments': { 'node':'nodevice', 'overlay':'snap_13' } }

+{ 'execute': 'blockdev-snapshot',

+                     'arguments': { 'node':'nodevice',

+                                    'overlay':'snap_13' }

+                   }

 {"error": {"class": "GenericError", "desc": "Cannot find device=nodevice nor node_name=nodevice"}}

 *** done

diff --git a/tests/qemu-iotests/094.out b/tests/qemu-iotests/094.out

index 9b6c57b3e2..97f894cf8f 100644

--- a/tests/qemu-iotests/094.out

+++ b/tests/qemu-iotests/094.out

@@ -3,13 +3,19 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

 Formatting 'TEST_DIR/source.IMGFMT', fmt=IMGFMT size=67108864

 {'execute': 'qmp_capabilities'}

 {"return": {}}

-{'execute': 'drive-mirror', 'arguments': {'device': 'src', 'target': 'nbd+unix:///?socket=SOCK_DIR/nbd', 'format': 'nbd', 'sync':'full', 'mode':'existing'}}

+{'execute': 'drive-mirror',

+      'arguments': {'device': 'src',

+                    'target': 'nbd+unix:///?socket=SOCK_DIR/nbd',

+                    'format': 'nbd',

+                    'sync':'full',

+                    'mode':'existing'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 67108864, "offset": 67108864, "speed": 0, "type": "mirror"}}

-{'execute': 'block-job-complete', 'arguments': {'device': 'src'}}

+{'execute': 'block-job-complete',

+      'arguments': {'device': 'src'}}

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}

diff --git a/tests/qemu-iotests/095.out b/tests/qemu-iotests/095.out

index e66ced58f8..8257c5e1e6 100644

--- a/tests/qemu-iotests/095.out

+++ b/tests/qemu-iotests/095.out

@@ -12,7 +12,9 @@ virtual size: 5 MiB (5242880 bytes)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{ 'execute': 'block-commit', 'arguments': { 'device': 'test', 'top': 'TEST_DIR/t.IMGFMT.snp1' } }

+{ 'execute': 'block-commit',

+                                 'arguments': { 'device': 'test',

+                                 'top': 'TEST_DIR/t.IMGFMT.snp1' } }

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "test"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "test"}}

 {"return": {}}

diff --git a/tests/qemu-iotests/109.out b/tests/qemu-iotests/109.out

index ad739df46c..6e73406cdb 100644

--- a/tests/qemu-iotests/109.out

+++ b/tests/qemu-iotests/109.out

@@ -6,7 +6,9 @@ Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -27,7 +29,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -51,7 +55,9 @@ Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -72,7 +78,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -96,7 +104,9 @@ Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -117,7 +127,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -141,7 +153,9 @@ Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -162,7 +176,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -186,7 +202,9 @@ Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -207,7 +225,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -231,7 +251,9 @@ Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -252,7 +274,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -275,7 +299,9 @@ Images are identical.

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -296,7 +322,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -319,7 +347,9 @@ Images are identical.

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -340,7 +370,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -363,7 +395,9 @@ Images are identical.

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -384,7 +418,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -407,7 +443,9 @@ Images are identical.

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -428,7 +466,9 @@ read 512/512 bytes at offset 0

 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

@@ -451,7 +491,9 @@ Images are identical.

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=SIZE

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.

          Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.

          Specify the 'raw' format explicitly to remove the restrictions.

@@ -473,7 +515,9 @@ WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed

 Images are identical.

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{'execute':'drive-mirror', 'arguments':{ 'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT', 'mode': 'existing', 'sync': 'full'}}

+{'execute':'drive-mirror', 'arguments':{

+            'device': 'src', 'target': 'TEST_DIR/t.IMGFMT', 'format': 'IMGFMT',

+            'mode': 'existing', 'sync': 'full'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}

 {"return": {}}

diff --git a/tests/qemu-iotests/117.out b/tests/qemu-iotests/117.out

index bb623dcc0a..735ffd25c6 100644

--- a/tests/qemu-iotests/117.out

+++ b/tests/qemu-iotests/117.out

@@ -2,11 +2,18 @@ QA output created by 117

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65536

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{ 'execute': 'blockdev-add', 'arguments': { 'node-name': 'protocol', 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT' } }

+{ 'execute': 'blockdev-add',

+       'arguments': { 'node-name': 'protocol',

+                      'driver': 'file',

+                      'filename': 'TEST_DIR/t.IMGFMT' } }

 {"return": {}}

-{ 'execute': 'blockdev-add', 'arguments': { 'node-name': 'format', 'driver': 'IMGFMT', 'file': 'protocol' } }

+{ 'execute': 'blockdev-add',

+       'arguments': { 'node-name': 'format',

+                      'driver': 'IMGFMT',

+                      'file': 'protocol' } }

 {"return": {}}

-{ 'execute': 'human-monitor-command', 'arguments': { 'command-line': 'qemu-io format "write -P 42 0 64k"' } }

+{ 'execute': 'human-monitor-command',

+       'arguments': { 'command-line': 'qemu-io format "write -P 42 0 64k"' } }

 wrote 65536/65536 bytes at offset 0

 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 {"return": ""}

diff --git a/tests/qemu-iotests/127.out b/tests/qemu-iotests/127.out

index efd6cb327f..1685c4850a 100644

--- a/tests/qemu-iotests/127.out

+++ b/tests/qemu-iotests/127.out

@@ -6,13 +6,21 @@ wrote 42/42 bytes at offset 0

 42 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{ 'execute': 'drive-mirror', 'arguments': { 'job-id': 'mirror', 'device': 'source', 'target': 'TEST_DIR/t.IMGFMT.overlay1', 'mode': 'existing', 'sync': 'top' } }

+{ 'execute': 'drive-mirror',

+       'arguments': {

+           'job-id': 'mirror',

+           'device': 'source',

+           'target': 'TEST_DIR/t.IMGFMT.overlay1',

+           'mode':   'existing',

+           'sync':   'top'

+       } }

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "mirror"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "mirror"}}

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "mirror"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "mirror", "len": 65536, "offset": 65536, "speed": 0, "type": "mirror"}}

-{ 'execute': 'block-job-complete', 'arguments': { 'device': 'mirror' } }

+{ 'execute': 'block-job-complete',

+       'arguments': { 'device': 'mirror' } }

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "mirror"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "mirror"}}

diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out

index 62d9c3ab3c..312f76d5da 100644

--- a/tests/qemu-iotests/140.out

+++ b/tests/qemu-iotests/140.out

@@ -4,13 +4,17 @@ wrote 65536/65536 bytes at offset 0

 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 { 'execute': 'qmp_capabilities' }

 {"return": {}}

-{ 'execute': 'nbd-server-start', 'arguments': { 'addr': { 'type': 'unix', 'data': { 'path': 'SOCK_DIR/nbd' }}}}

+{ 'execute': 'nbd-server-start',

+       'arguments': { 'addr': { 'type': 'unix',

+                                'data': { 'path': 'SOCK_DIR/nbd' }}}}

 {"return": {}}

-{ 'execute': 'nbd-server-add', 'arguments': { 'device': 'drv' }}

+{ 'execute': 'nbd-server-add',

+       'arguments': { 'device': 'drv' }}

 {"return": {}}

 read 65536/65536 bytes at offset 0

 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

-{ 'execute': 'eject', 'arguments': { 'device': 'drv' }}

+{ 'execute': 'eject',

+       'arguments': { 'device': 'drv' }}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_EXPORT_DELETED", "data": {"id": "drv"}}

 qemu-io: can't open device nbd+unix:///drv?socket=SOCK_DIR/nbd: Requested export not available

 server reported: export 'drv' not present

diff --git a/tests/qemu-iotests/141.out b/tests/qemu-iotests/141.out

index 08e0aecd65..6d8652e22b 100644

--- a/tests/qemu-iotests/141.out

+++ b/tests/qemu-iotests/141.out

@@ -7,105 +7,173 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/m.

 === Testing drive-backup ===

-{'execute': 'blockdev-add', 'arguments': { 'node-name': 'drv0', 'driver': 'IMGFMT', 'file': { 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT' }}}

-{"return": {}}

-{'execute': 'drive-backup', 'arguments': {'job-id': 'job0', 'device': 'drv0', 'target': 'TEST_DIR/o.IMGFMT', 'format': 'IMGFMT', 'sync': 'none'}}

+{'execute': 'blockdev-add',

+          'arguments': {

+              'node-name': 'drv0',

+              'driver': 'IMGFMT',

+              'file': {

+                  'driver': 'file',

+                  'filename': 'TEST_DIR/t.IMGFMT'

+              }}}

+{"return": {}}

+{'execute': 'drive-backup',

+'arguments': {'job-id': 'job0',

+'device': 'drv0',

+'target': 'TEST_DIR/o.IMGFMT',

+'format': 'IMGFMT',

+'sync': 'none'}}

 Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: node is used as backing hd of 'NODE_NAME'"}}

-{'execute': 'block-job-cancel', 'arguments': {'device': 'job0'}}

+{'execute': 'block-job-cancel',

+          'arguments': {'device': 'job0'}}

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 0, "speed": 0, "type": "backup"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"return": {}}

 === Testing drive-mirror ===

-{'execute': 'blockdev-add', 'arguments': { 'node-name': 'drv0', 'driver': 'IMGFMT', 'file': { 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT' }}}

-{"return": {}}

-{'execute': 'drive-mirror', 'arguments': {'job-id': 'job0', 'device': 'drv0', 'target': 'TEST_DIR/o.IMGFMT', 'format': 'IMGFMT', 'sync': 'none'}}

+{'execute': 'blockdev-add',

+          'arguments': {

+              'node-name': 'drv0',

+              'driver': 'IMGFMT',

+              'file': {

+                  'driver': 'file',

+                  'filename': 'TEST_DIR/t.IMGFMT'

+              }}}

+{"return": {}}

+{'execute': 'drive-mirror',

+'arguments': {'job-id': 'job0',

+'device': 'drv0',

+'target': 'TEST_DIR/o.IMGFMT',

+'format': 'IMGFMT',

+'sync': 'none'}}

 Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: mirror"}}

-{'execute': 'block-job-cancel', 'arguments': {'device': 'job0'}}

+{'execute': 'block-job-cancel',

+          'arguments': {'device': 'job0'}}

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"return": {}}

 === Testing active block-commit ===

-{'execute': 'blockdev-add', 'arguments': { 'node-name': 'drv0', 'driver': 'IMGFMT', 'file': { 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT' }}}

-{"return": {}}

-{'execute': 'block-commit', 'arguments': {'job-id': 'job0', 'device': 'drv0'}}

+{'execute': 'blockdev-add',

+          'arguments': {

+              'node-name': 'drv0',

+              'driver': 'IMGFMT',

+              'file': {

+                  'driver': 'file',

+                  'filename': 'TEST_DIR/t.IMGFMT'

+              }}}

+{"return": {}}

+{'execute': 'block-commit',

+'arguments': {'job-id': 'job0', 'device': 'drv0'}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: commit"}}

-{'execute': 'block-job-cancel', 'arguments': {'device': 'job0'}}

+{'execute': 'block-job-cancel',

+          'arguments': {'device': 'job0'}}

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"return": {}}

 === Testing non-active block-commit ===

 wrote 1048576/1048576 bytes at offset 0

 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

-{'execute': 'blockdev-add', 'arguments': { 'node-name': 'drv0', 'driver': 'IMGFMT', 'file': { 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT' }}}

-{"return": {}}

-{'execute': 'block-commit', 'arguments': {'job-id': 'job0', 'device': 'drv0', 'top': 'TEST_DIR/m.IMGFMT', 'speed': 1}}

+{'execute': 'blockdev-add',

+          'arguments': {

+              'node-name': 'drv0',

+              'driver': 'IMGFMT',

+              'file': {

+                  'driver': 'file',

+                  'filename': 'TEST_DIR/t.IMGFMT'

+              }}}

+{"return": {}}

+{'execute': 'block-commit',

+'arguments': {'job-id': 'job0',

+'device': 'drv0',

+'top':    'TEST_DIR/m.IMGFMT',

+'speed':  1}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}

-{'execute': 'block-job-cancel', 'arguments': {'device': 'job0'}}

+{'execute': 'block-job-cancel',

+          'arguments': {'device': 'job0'}}

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 524288, "speed": 1, "type": "commit"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"return": {}}

 === Testing block-stream ===

 wrote 1048576/1048576 bytes at offset 0

 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

-{'execute': 'blockdev-add', 'arguments': { 'node-name': 'drv0', 'driver': 'IMGFMT', 'file': { 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT' }}}

-{"return": {}}

-{'execute': 'block-stream', 'arguments': {'job-id': 'job0', 'device': 'drv0', 'speed': 1}}

+{'execute': 'blockdev-add',

+          'arguments': {

+              'node-name': 'drv0',

+              'driver': 'IMGFMT',

+              'file': {

+                  'driver': 'file',

+                  'filename': 'TEST_DIR/t.IMGFMT'

+              }}}

+{"return": {}}

+{'execute': 'block-stream',

+'arguments': {'job-id': 'job0',

+'device': 'drv0',

+'speed': 1}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}

-{'execute': 'block-job-cancel', 'arguments': {'device': 'job0'}}

+{'execute': 'block-job-cancel',

+          'arguments': {'device': 'job0'}}

 {"return": {}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 524288, "speed": 1, "type": "stream"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}

 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}

-{'execute': 'blockdev-del', 'arguments': {'node-name': 'drv0'}}

+{'execute': 'blockdev-del',

+          'arguments': {'node-name': 'drv0'}}

 {"return": {}}