The following changes since commit b98a66201dbc7cf3b962f4bb260f66100cc75578:

Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc0-2' into staging (2019-03-19 12:55:02 +0000)

for you to fetch changes up to 59fba0aaee7438002d9803a86c888f21a1070cc8:

qemu-iotests: Treat custom TEST_DIR in 051 (2019-03-19 15:51:31 +0100)

Block layer patches:

- mirror: Fix early return from drain (could cause deadlocks)

- vmdk: Fixed probing for version 3 images

- vl: Fix to create migration object before block backends again (fixes

segfault for block drivers that set migration blockers)

- Several minor fixes, documentation and test case improvements

Alberto Garcia (1):

block: Make bdrv_{copy_on_read,crypto_luks,replication} static

Kevin Wolf (3):

qcow2: Fix data file error condition in qcow2_co_create()

block: Silence Coverity in bdrv_drop_intermediate()

qemu-iotests: Fix 232 for non-qcow2

Lukáš Doktor (1):

qemu-iotests: Treat custom TEST_DIR in 051

Markus Armbruster (1):

vl: Fix to create migration object before block backends again

Max Reitz (1):

blockdev: Check @replaces in blockdev_mirror_common

Sam Eiderman (1):

vmdk: Support version=3 in VMDK descriptor files

Sergio Lopez (2):

mirror: Confirm we're quiesced only if the job is paused or cancelled

iotests: 153: Wait for an answer to QMP commands

From: Lukáš Doktor <ldoktor@redhat.com>

When custom TEST_DIR is specified the output includes it without leading

'/':

$ TEST_DIR=/var/tmp ./check -file -qcow2 051

....

-drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file":

{"driver": "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2",

"file": {"driver": "file", "filename": SNAPSHOT_PATH}} (qcow2,

read-only)

+drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file":

{"driver": "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2",

"file": {"driver": "file", "filename": "TEST_DIR/vl.ziHfeP"}} (qcow2,

read-only)

Let's remove it from the sed regexp.

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>

tests/qemu-iotests/051 | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/051

+++ b/tests/qemu-iotests/051

@@ -XXX,XX +XXX,XX @@ TMPDIR=/nonexistent run_qemu -drive driver=null-co,snapshot=on

echo "info block" |

run_qemu -drive file="$TEST_IMG",snapshot=on,read-only=on,if=none,id=$device_id |

_filter_qemu_io |

- sed -e 's#"/[^"]*/vl\.[A-Za-z0-9]\{6\}"#SNAPSHOT_PATH#g'

+ sed -e 's#"[^"]*/vl\.[A-Za-z0-9]\{6\}"#SNAPSHOT_PATH#g'

# success, all done

2.20.1

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

Job (especially mirror) may call block_job_error_action several

times before actual pause if it has several in-flight requests.

block_job_error_action will call job_pause more than once in this case,

which lead to following block-job-resume qmp command can't actually

resume the job.

Fix it by do not increase pause level in block_job_error_action if

user_paused already set.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

blockjob.c | 8 +++++---

1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/blockjob.c b/blockjob.c

--- a/blockjob.c

+++ b/blockjob.c

@@ -XXX,XX +XXX,XX @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err,

action);

}

if (action == BLOCK_ERROR_ACTION_STOP) {

- job_pause(&job->job);

- /* make the pause user visible, which will be resumed from QMP. */

- job->job.user_paused = true;

+ if (!job->job.user_paused) {

+ job_pause(&job->job);

+ /* make the pause user visible, which will be resumed from QMP. */

+ job->job.user_paused = true;

+ }

block_job_iostatus_set_err(job, error);

}

return action;

2.20.1

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

There no @device parameter, only the @id one.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

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

1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -XXX,XX +XXX,XX @@

#

# Manage read, write and flush latency histograms for the device.

#

-# If only @device parameter is specified, remove all present latency histograms

+# If only @id parameter is specified, remove all present latency histograms

# for the device. Otherwise, add/reset some of (or all) latency histograms.

#

# @id: The name or QOM path of the guest device.

@@ -XXX,XX +XXX,XX @@

# [0, 10), [10, 50), [50, 100), [100, +inf):

#

# -> { "execute": "block-latency-histogram-set",

-# "arguments": { "device": "drive0",

+# "arguments": { "id": "drive0",

# "boundaries": [10, 50, 100] } }

# <- { "return": {} }

#

@@ -XXX,XX +XXX,XX @@

# not changed (or not created):

#

# -> { "execute": "block-latency-histogram-set",

-# "arguments": { "device": "drive0",

+# "arguments": { "id": "drive0",

# "boundaries-write": [10, 50, 100] } }

# <- { "return": {} }

#

@@ -XXX,XX +XXX,XX @@

# write: [0, 1000), [1000, 5000), [5000, +inf)

#

# -> { "execute": "block-latency-histogram-set",

-# "arguments": { "device": "drive0",

+# "arguments": { "id": "drive0",

# "boundaries": [10, 50, 100],

# "boundaries-write": [1000, 5000] } }

# <- { "return": {} }

@@ -XXX,XX +XXX,XX @@

# Example: remove all latency histograms:

#

# -> { "execute": "block-latency-histogram-set",

-# "arguments": { "device": "drive0" } }

+# "arguments": { "id": "drive0" } }

# <- { "return": {} }

##

{ 'command': 'block-latency-histogram-set',

2.20.1

From: Sergio Lopez <slp@redhat.com>

There are various actions in this test that must be executed

sequentially, as the result of it depends on the state triggered by the

previous one.

If the last argument of _send_qemu_cmd() is an empty string, it just

sends the QMP commands without waiting for an answer. While unlikely, it

may happen that the next action in the test gets invoked before QEMU

processes the QMP request.

This issue seems to be easier to reproduce on servers with limited

resources or highly loaded.

With this change, we wait for an answer on all _send_qemu_cmd() calls.

Signed-off-by: Sergio Lopez <slp@redhat.com>

tests/qemu-iotests/153 | 12 ++++++------

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

2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/153

+++ b/tests/qemu-iotests/153

@@ -XXX,XX +XXX,XX @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do

_img_info -U | grep 'file format'

fi

done

- _send_qemu_cmd $h "{ 'execute': 'quit', }" ""

+ _send_qemu_cmd $h "{ 'execute': 'quit' }" ''

echo

echo "Round done"

_cleanup_qemu

@@ -XXX,XX +XXX,XX @@ echo "Adding drive"

_send_qemu_cmd $QEMU_HANDLE \

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

'arguments': { 'command-line': 'drive_add 0 if=none,id=d0,file=${TEST_IMG}' } }" \

- ""

+ 'return'

_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512'

@@ -XXX,XX +XXX,XX @@ echo "== Closing an image should unlock it =="

_send_qemu_cmd $QEMU_HANDLE \

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

'arguments': { 'command-line': 'drive_del d0' } }" \

- ""

+ 'return'

_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512'

@@ -XXX,XX +XXX,XX @@ for d in d0 d1; do

_send_qemu_cmd $QEMU_HANDLE \

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

'arguments': { 'command-line': 'drive_add 0 if=none,id=$d,file=${TEST_IMG},readonly=on' } }" \

- ""

+ 'return'

done

_run_cmd $QEMU_IMG info "${TEST_IMG}"

@@ -XXX,XX +XXX,XX @@ _run_cmd $QEMU_IMG info "${TEST_IMG}"

_send_qemu_cmd $QEMU_HANDLE \

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

'arguments': { 'command-line': 'drive_del d0' } }" \

- ""

+ 'return'

_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512'

@@ -XXX,XX +XXX,XX @@ echo "Closing the other"

_send_qemu_cmd $QEMU_HANDLE \

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

'arguments': { 'command-line': 'drive_del d1' } }" \

- ""

+ 'return'

_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512'

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

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

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

@@ -XXX,XX +XXX,XX @@ Is another process using the image [TEST_DIR/t.qcow2]?

_qemu_img_wrapper commit -b TEST_DIR/t.qcow2.b TEST_DIR/t.qcow2.c

{"return": {}}

Adding drive

+{"return": "OKrn"}

_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512

can't open device TEST_DIR/t.qcow2: Failed to get "write" lock

@@ -XXX,XX +XXX,XX @@ Creating overlay with qemu-img when the guest is running should be allowed

_qemu_img_wrapper create -f qcow2 -b TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.overlay

== Closing an image should unlock it ==

+{"return": ""}

_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512

Adding two and closing one

+{"return": "OKrn"}

+{"return": "OKrn"}

_qemu_img_wrapper info TEST_DIR/t.qcow2

+{"return": ""}

_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512

can't open device TEST_DIR/t.qcow2: Failed to get "write" lock

Is another process using the image [TEST_DIR/t.qcow2]?

Closing the other

+{"return": ""}

_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512

2.20.1

From: Markus Armbruster <armbru@redhat.com>

Recent commit cda4aa9a5a0 moved block backend creation before machine

property evaluation. This broke qemu-iotests 055. Turns out we need

to create the migration object before block backends, so block

backends can add migration blockers. Fix by calling

migration_object_init() earlier, right before configure_blockdev().

Fixes: cda4aa9a5a08777cf13e164c0543bd4888b8adce

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

Signed-off-by: Markus Armbruster <armbru@redhat.com>

vl.c | 15 ++++++++-------

1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/vl.c b/vl.c

--- a/vl.c

+++ b/vl.c

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)

exit(0);

}

+ /*

+ * Migration object can only be created after global properties

+ * are applied correctly.

+ */

+ migration_object_init();

/*

* Note: we need to create block backends before

* machine_set_property(), so machine properties can refer to

- * them.

+ * them, and after migration_object_init(), so we can create

+ * migration blockers.

*/

configure_blockdev(&bdo_queue, machine_class, snapshot);

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)

machine_class->name, machine_class->deprecation_reason);

}

- /*

- * Migration object can only be created after global properties

- * are applied correctly.

- */

- migration_object_init();

-

if (qtest_chrdev) {

qtest_init(qtest_chrdev, qtest_log, &error_fatal);

}

2.20.1

From: Max Reitz <mreitz@redhat.com>

There is no reason why the constraints we put on @replaces should be

limited to drive-mirror. Therefore, move the sanity checks from

qmp_drive_mirror() to blockdev_mirror_common() so they apply to

blockdev-mirror as well.

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

Reviewed-by: Eric Blake <eblake@redhat.com>

Reviewed-by: Alberto Garcia <berto@igalia.com>

blockdev.c | 55 ++++++++++++++++++++++++++++++++----------------------

1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/blockdev.c b/blockdev.c

--- a/blockdev.c

+++ b/blockdev.c

@@ -XXX,XX +XXX,XX @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,

sync = MIRROR_SYNC_MODE_FULL;

}

+ if (has_replaces) {

+ BlockDriverState *to_replace_bs;

+ AioContext *replace_aio_context;

+ int64_t bs_size, replace_size;

+

+ bs_size = bdrv_getlength(bs);

+ if (bs_size < 0) {

+ error_setg_errno(errp, -bs_size, "Failed to query device's size");

+

+ to_replace_bs = check_to_replace_node(bs, replaces, errp);

+ if (!to_replace_bs) {

+ return;

+ }

+

+ replace_aio_context = bdrv_get_aio_context(to_replace_bs);

+ aio_context_acquire(replace_aio_context);

+ replace_size = bdrv_getlength(to_replace_bs);

+ aio_context_release(replace_aio_context);

+

+ if (replace_size < 0) {

+ error_setg_errno(errp, -replace_size,

+ "Failed to query the replacement node's size");

+ return;

+ }

+ if (bs_size != replace_size) {

+ error_setg(errp, "cannot replace image with a mirror image of "

+ "different size");

+ return;

+ }

+ }

+

/* pass the node name to replace to mirror start since it's loose coupling

* and will allow to check whether the node still exist at mirror completion

*/

@@ -XXX,XX +XXX,XX @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)

}

if (arg->has_replaces) {

- BlockDriverState *to_replace_bs;

- AioContext *replace_aio_context;

- int64_t replace_size;

-

if (!arg->has_node_name) {

error_setg(errp, "a node-name must be provided when replacing a"

" named node of the graph");

goto out;

}

-

- to_replace_bs = check_to_replace_node(bs, arg->replaces, &local_err);

-

- if (!to_replace_bs) {

- error_propagate(errp, local_err);

- goto out;

- }

-

- replace_aio_context = bdrv_get_aio_context(to_replace_bs);

- aio_context_acquire(replace_aio_context);

- replace_size = bdrv_getlength(to_replace_bs);

- aio_context_release(replace_aio_context);

-

- if (size != replace_size) {

- error_setg(errp, "cannot replace image with a mirror image of "

- "different size");

- goto out;

- }

}

if (arg->mode == NEW_IMAGE_MODE_ABSOLUTE_PATHS) {

2.20.1

From: Alberto Garcia <berto@igalia.com>

Signed-off-by: Alberto Garcia <berto@igalia.com>

block/copy-on-read.c | 2 +-

block/crypto.c | 2 +-

block/replication.c | 2 +-

3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/copy-on-read.c b/block/copy-on-read.c

--- a/block/copy-on-read.c

+++ b/block/copy-on-read.c

@@ -XXX,XX +XXX,XX @@ static bool cor_recurse_is_first_non_filter(BlockDriverState *bs,

-BlockDriver bdrv_copy_on_read = {

+static BlockDriver bdrv_copy_on_read = {

.format_name = "copy-on-read",

.bdrv_open = cor_open,

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

index XXXXXXX..XXXXXXX 100644

--- a/block/crypto.c

+++ b/block/crypto.c

@@ -XXX,XX +XXX,XX @@ static const char *const block_crypto_strong_runtime_opts[] = {

NULL

};

-BlockDriver bdrv_crypto_luks = {

+static BlockDriver bdrv_crypto_luks = {

.format_name = "luks",

.instance_size = sizeof(BlockCrypto),

.bdrv_probe = block_crypto_probe_luks,

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

index XXXXXXX..XXXXXXX 100644

--- a/block/replication.c

+++ b/block/replication.c

@@ -XXX,XX +XXX,XX @@ static const char *const replication_strong_runtime_opts[] = {

NULL

};

-BlockDriver bdrv_replication = {

+static BlockDriver bdrv_replication = {

.format_name = "replication",

.instance_size = sizeof(BDRVReplicationState),

2.20.1

From: Sam Eiderman <shmuel.eiderman@oracle.com>

Commit 509d39aa22909c0ed1aabf896865f19c81fb38a1 added support for read

only VMDKs of version 3.

This commit fixes the probe function to correctly handle descriptors of

version 3.

This commit has two effects:

1. We no longer need to supply '-f vmdk' when pointing to descriptor

files of version 3 in qemu/qemu-img command line arguments.

2. This fixes the scenario where a VMDK points to a parent version 3

descriptor file which is being probed as "raw" instead of "vmdk".

Reviewed-by: Arbel Moshe <arbel.moshe@oracle.com>

Reviewed-by: Mark Kanda <mark.kanda@oracle.com>

Signed-off-by: Shmuel Eiderman <shmuel.eiderman@oracle.com>

block/vmdk.c | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

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

--- a/block/vmdk.c

+++ b/block/vmdk.c

@@ -XXX,XX +XXX,XX @@ static int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename)

}

if (end - p >= strlen("version=X\n")) {

if (strncmp("version=1\n", p, strlen("version=1\n")) == 0 ||

- strncmp("version=2\n", p, strlen("version=2\n")) == 0) {

+ strncmp("version=2\n", p, strlen("version=2\n")) == 0 ||

+ strncmp("version=3\n", p, strlen("version=3\n")) == 0) {

return 100;

}

}

if (end - p >= strlen("version=X\r\n")) {

if (strncmp("version=1\r\n", p, strlen("version=1\r\n")) == 0 ||

- strncmp("version=2\r\n", p, strlen("version=2\r\n")) == 0) {

+ strncmp("version=2\r\n", p, strlen("version=2\r\n")) == 0 ||

+ strncmp("version=3\r\n", p, strlen("version=3\r\n")) == 0) {

return 100;

}

}

2.20.1

232 is marked as generic, but commit 12efe428c9e added code that assumes

qcow2. What the new test really needs is backing files and support for

updating the backing file link (.bdrv_change_backing_file).

Split the non-generic code into a new test case 247 and make it work

with qed, too.

tests/qemu-iotests/232 | 30 ---------------

tests/qemu-iotests/232.out | 20 ----------

tests/qemu-iotests/247 | 79 ++++++++++++++++++++++++++++++++++++++

tests/qemu-iotests/247.out | 22 +++++++++++

tests/qemu-iotests/group | 1 +

5 files changed, 102 insertions(+), 50 deletions(-)

create mode 100755 tests/qemu-iotests/247

create mode 100644 tests/qemu-iotests/247.out

diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/232

+++ b/tests/qemu-iotests/232

@@ -XXX,XX +XXX,XX @@ run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,a

run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0,auto-read-only=on

run_qemu_info_block -blockdev driver=file,filename="$TEST_IMG",node-name=node0

-echo

-echo "=== Try commit to backing file with auto-read-only ==="

-echo

-

-TEST_IMG="$TEST_IMG.0" _make_test_img $size

-TEST_IMG="$TEST_IMG.1" _make_test_img $size

-TEST_IMG="$TEST_IMG.2" _make_test_img $size

-TEST_IMG="$TEST_IMG.3" _make_test_img $size

-TEST_IMG="$TEST_IMG.4" _make_test_img $size

-

-(cat <<EOF

-{"execute":"qmp_capabilities"}

-{"execute":"block-commit",

- "arguments":{"device":"format-4", "top-node": "format-2", "base-node":"format-0", "job-id":"job0"}}

-EOF

-sleep 1

-echo '{"execute":"quit"}'

-) | $QEMU -qmp stdio -nographic -nodefaults \

- -blockdev file,node-name=file-0,filename=$TEST_IMG.0,auto-read-only=on \

- -blockdev qcow2,node-name=format-0,file=file-0,read-only=on \

- -blockdev file,node-name=file-1,filename=$TEST_IMG.1,auto-read-only=on \

- -blockdev qcow2,node-name=format-1,file=file-1,read-only=on,backing=format-0 \

- -blockdev file,node-name=file-2,filename=$TEST_IMG.2,auto-read-only=on \

- -blockdev qcow2,node-name=format-2,file=file-2,read-only=on,backing=format-1 \

- -blockdev file,node-name=file-3,filename=$TEST_IMG.3,auto-read-only=on \

- -blockdev qcow2,node-name=format-3,file=file-3,read-only=on,backing=format-2 \

- -blockdev file,node-name=file-4,filename=$TEST_IMG.4,auto-read-only=on \

- -blockdev qcow2,node-name=format-4,file=file-4,read-only=on,backing=format-3 |

- _filter_qmp

-

# success, all done

echo "*** done"

rm -f $seq.full

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,read

QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0,auto-read-only=off: Could not open 'TEST_DIR/t.IMGFMT': Permission denied

node0: TEST_DIR/t.IMGFMT (file)

QEMU_PROG: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0: Could not open 'TEST_DIR/t.IMGFMT': Permission denied

-

-=== Try commit to backing file with auto-read-only ===

-

-Formatting 'TEST_DIR/t.IMGFMT.0', fmt=IMGFMT size=134217728

-Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728

-Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728

-Formatting 'TEST_DIR/t.IMGFMT.3', fmt=IMGFMT size=134217728

-Formatting 'TEST_DIR/t.IMGFMT.4', fmt=IMGFMT size=134217728

-QMP_VERSION

-{"return": {}}

-{"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"}}

-{"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": 134217728, "offset": 134217728, "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"}}

-{"return": {}}

-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}

*** done

diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247

+++ b/tests/qemu-iotests/247

@@ -XXX,XX +XXX,XX @@

+#!/usr/bin/env bash

+#

+# Test for auto-read-only with commit block job

+#

+# Copyright (C) 2019 Red Hat, Inc.

+#

+

+# 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_IMG.[01234]

+}

+trap "_cleanup; exit \$status" 0 1 2 3 15

+

+# get standard environment, filters and checks

+. ./common.rc

+. ./common.filter

+

+# Requires backing files and .bdrv_change_backing_file support

+_supported_fmt qcow2 qed

+_supported_proto file

+_supported_os Linux

+

+size=128M

+

+echo

+echo "=== Try commit to backing file with auto-read-only ==="

+echo

+TEST_IMG="$TEST_IMG.0" _make_test_img $size

+TEST_IMG="$TEST_IMG.1" _make_test_img $size

+TEST_IMG="$TEST_IMG.2" _make_test_img $size

+TEST_IMG="$TEST_IMG.3" _make_test_img $size

+TEST_IMG="$TEST_IMG.4" _make_test_img $size

+

+(cat <<EOF

+{"execute":"qmp_capabilities"}

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

+ "arguments":{"device":"format-4", "top-node": "format-2", "base-node":"format-0", "job-id":"job0"}}

+EOF

+sleep 1

+echo '{"execute":"quit"}'

+) | $QEMU -qmp stdio -nographic -nodefaults \

+ -blockdev file,node-name=file-0,filename=$TEST_IMG.0,auto-read-only=on \

+ -blockdev $IMGFMT,node-name=format-0,file=file-0,read-only=on \

+ -blockdev file,node-name=file-1,filename=$TEST_IMG.1,auto-read-only=on \

+ -blockdev $IMGFMT,node-name=format-1,file=file-1,read-only=on,backing=format-0 \

+ -blockdev file,node-name=file-2,filename=$TEST_IMG.2,auto-read-only=on \

+ -blockdev $IMGFMT,node-name=format-2,file=file-2,read-only=on,backing=format-1 \

+ -blockdev file,node-name=file-3,filename=$TEST_IMG.3,auto-read-only=on \

+ -blockdev $IMGFMT,node-name=format-3,file=file-3,read-only=on,backing=format-2 \

+ -blockdev file,node-name=file-4,filename=$TEST_IMG.4,auto-read-only=on \

+ -blockdev $IMGFMT,node-name=format-4,file=file-4,read-only=on,backing=format-3 |

+ _filter_qmp

+

+# success, all done

+echo "*** done"

+rm -f $seq.full

+status=0

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