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)

- 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

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

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

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

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

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

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

# 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.

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

#

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

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

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

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

# <- { "return": {} }

# 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',

Coverity doesn't like that the return value of bdrv_check_update_perm()

stays unused only in this place (CID 1399710).

Even if checking local_err should be equivalent to checking ret < 0,

let's switch to using the return value to be more consistent (and in

case of a bug somewhere down the call chain, forgetting to assign errp

is more likely than returning 0 for an error case).

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

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

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

block.c | 7 +++----

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

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

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ int bdrv_drop_intermediate(BlockDriverState *top, BlockDriverState *base,

QLIST_FOREACH_SAFE(c, &top->parents, next_parent, next) {

/* Check whether we are allowed to switch c from top to base */

GSList *ignore_children = g_slist_prepend(NULL, c);

- bdrv_check_update_perm(base, NULL, c->perm, c->shared_perm,

- ignore_children, &local_err);

+ ret = bdrv_check_update_perm(base, NULL, c->perm, c->shared_perm,

+ ignore_children, &local_err);

g_slist_free(ignore_children);

- if (local_err) {

- ret = -EPERM;

+ if (ret < 0) {

error_report_err(local_err);

goto exit;

}

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: Alberto Garcia <berto@igalia.com>

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

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

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

@@ -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");

+ return;

+ }

+

+ 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) {

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.

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;

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

--- 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

new file mode 100755

index XXXXXXX..XXXXXXX

--- /dev/null

+++ 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.

+#

+# 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_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

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

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

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

+QA output created by 247

+

+=== 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/group b/tests/qemu-iotests/group

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/group

+++ b/tests/qemu-iotests/group

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

244 rw auto quick

245 rw auto

246 rw auto quick

+247 rw auto quick

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>

Signed-off-by: Kevin Wolf <kwolf@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

We were trying to check whether bdrv_open_blockdev_ref() returned

success, but accidentally checked the wrong variable. Spotted by

Coverity (CID 1399703).

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

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

block/qcow2.c | 2 +-

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

@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)

goto out;

}

data_bs = bdrv_open_blockdev_ref(qcow2_opts->data_file, errp);

- if (bs == NULL) {

+ if (data_bs == NULL) {

ret = -EIO;

goto out;

}