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

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

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

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

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: Peter Maydell <peter.maydell@linaro.org>

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

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

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

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

goto exit;

}

2.20.1

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