The following changes since commit 98b2faeaee96ab084d0b1669918688d8895c155f:

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging (2017-02-10 18:07:02 +0000)

git://github.com/XanClic/qemu.git tags/pull-block-2017-02-12

for you to fetch changes up to 10d6eda1926804a09aa0710ca62933087813de0b:

qemu-img: Avoid setting ret to unused value in img_convert() (2017-02-12 00:56:32 +0100)

Daniel P. Berrange (1):

iotests: record separate timings per format,protocol pair

Dou Liyang (2):

block/qapi: reduce the coupling between the bdrv_query_stats and bdrv_query_bds_stats

block/qapi: reduce the execution time of qmp_query_blockstats

Fam Zheng (2):

qapi: Tweak error message of bdrv_query_image_info

iotests: Fix reference output for 059

From: Dou Liyang <douly.fnst@cn.fujitsu.com>

The bdrv_query_stats and bdrv_query_bds_stats functions need to call

each other, that increases the coupling. it also makes the program

complicated and makes some unnecessary tests.

Remove the call from bdrv_query_bds_stats to bdrv_query_stats, just

take some recursion to make it clearly.

Avoid testing whether the blk is NULL during querying the bds stats.

It is unnecessary.

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>

Message-id: 1484467275-27919-2-git-send-email-douly.fnst@cn.fujitsu.com

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

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

block/qapi.c | 26 ++++++++++++++------------

1 file changed, 14 insertions(+), 12 deletions(-)

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

--- a/block/qapi.c

+++ b/block/qapi.c

@@ -XXX,XX +XXX,XX @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,

qapi_free_BlockInfo(info);

-static BlockStats *bdrv_query_stats(BlockBackend *blk,

- const BlockDriverState *bs,

- bool query_backing);

static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk)

{

BlockAcctStats *stats = blk_get_stats(blk);

@@ -XXX,XX +XXX,XX @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk)

-static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs,

+static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs,

bool query_backing)

{

+ BlockStats *s = NULL;

+

+ s = g_malloc0(sizeof(*s));

+ s->stats = g_malloc0(sizeof(*s->stats));

+

+ if (!bs) {

+ return s;

+ }

+

if (bdrv_get_node_name(bs)[0]) {

s->has_node_name = true;

s->node_name = g_strdup(bdrv_get_node_name(bs));

@@ -XXX,XX +XXX,XX @@ static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs,

if (bs->file) {

s->has_parent = true;

- s->parent = bdrv_query_stats(NULL, bs->file->bs, query_backing);

+ s->parent = bdrv_query_bds_stats(bs->file->bs, query_backing);

if (query_backing && bs->backing) {

s->has_backing = true;

- s->backing = bdrv_query_stats(NULL, bs->backing->bs, query_backing);

+ s->backing = bdrv_query_bds_stats(bs->backing->bs, query_backing);

+ return s;

}

static BlockStats *bdrv_query_stats(BlockBackend *blk,

@@ -XXX,XX +XXX,XX @@ static BlockStats *bdrv_query_stats(BlockBackend *blk,

{

BlockStats *s;

- s = g_malloc0(sizeof(*s));

- s->stats = g_malloc0(sizeof(*s->stats));

+ s = bdrv_query_bds_stats(bs, query_backing);

if (blk) {

s->has_device = true;

s->device = g_strdup(blk_name(blk));

bdrv_query_blk_stats(s->stats, blk);

}

- if (bs) {

- bdrv_query_bds_stats(s, bs, query_backing);

- }

return s;

}

2.11.0

From: Dou Liyang <douly.fnst@cn.fujitsu.com>

In order to reduce the execution time, this patch optimize

the qmp_query_blockstats():

Remove the next_query_bds function.

Remove the bdrv_query_stats function.

Remove some judgement sentence.

The original qmp_query_blockstats calls next_query_bds to get

the next objects in each loops. In the next_query_bds, it checks

the query_nodes and blk. It also call bdrv_query_stats to get

the stats, In the bdrv_query_stats, it checks blk and bs each

times. This waste more times, which may stall the main loop a

bit. And if the disk is too many and donot use the dataplane

feature, this may affect the performance in main loop thread.

This patch removes that two functions, and makes the structure

clearly.

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>

Message-id: 1484467275-27919-3-git-send-email-douly.fnst@cn.fujitsu.com

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

[mreitz: Removed duplicate info->value assignment]

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

block/qapi.c | 73 ++++++++++++++++++++++++------------------------------------

1 file changed, 29 insertions(+), 44 deletions(-)

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

--- a/block/qapi.c

+++ b/block/qapi.c

@@ -XXX,XX +XXX,XX @@ static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs,

return s;

-static BlockStats *bdrv_query_stats(BlockBackend *blk,

- const BlockDriverState *bs,

- bool query_backing)

- BlockStats *s;

- s = bdrv_query_bds_stats(bs, query_backing);

-

- if (blk) {

- s->has_device = true;

- s->device = g_strdup(blk_name(blk));

- bdrv_query_blk_stats(s->stats, blk);

- return s;

-}

-

BlockInfoList *qmp_query_block(Error **errp)

{

BlockInfoList *head = NULL, **p_next = &head;

@@ -XXX,XX +XXX,XX @@ BlockInfoList *qmp_query_block(Error **errp)

return head;

}

-static bool next_query_bds(BlockBackend **blk, BlockDriverState **bs,

- bool query_nodes)

-{

- if (query_nodes) {

- *bs = bdrv_next_node(*bs);

- return !!*bs;

- *blk = blk_next(*blk);

- *bs = *blk ? blk_bs(*blk) : NULL;

-

- return !!*blk;

BlockStatsList *qmp_query_blockstats(bool has_query_nodes,

bool query_nodes,

Error **errp)

{

BlockStatsList *head = NULL, **p_next = &head;

- BlockBackend *blk = NULL;

- BlockDriverState *bs = NULL;

+ BlockBackend *blk;

+ BlockDriverState *bs;

/* Just to be safe if query_nodes is not always initialized */

- query_nodes = has_query_nodes && query_nodes;

- while (next_query_bds(&blk, &bs, query_nodes)) {

- BlockStatsList *info = g_malloc0(sizeof(*info));

- AioContext *ctx = blk ? blk_get_aio_context(blk)

- : bdrv_get_aio_context(bs);

+ if (has_query_nodes && query_nodes) {

+ for (bs = bdrv_next_node(NULL); bs; bs = bdrv_next_node(bs)) {

+ BlockStatsList *info = g_malloc0(sizeof(*info));

+ AioContext *ctx = bdrv_get_aio_context(bs);

- aio_context_acquire(ctx);

- info->value = bdrv_query_stats(blk, bs, !query_nodes);

- aio_context_release(ctx);

+ aio_context_acquire(ctx);

+ info->value = bdrv_query_bds_stats(bs, false);

+ aio_context_release(ctx);

- *p_next = info;

- p_next = &info->next;

+ *p_next = info;

+ p_next = &info->next;

+ }

+ } else {

+ for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {

+ BlockStatsList *info = g_malloc0(sizeof(*info));

+ AioContext *ctx = blk_get_aio_context(blk);

+ BlockStats *s;

+

+ aio_context_acquire(ctx);

+ s = bdrv_query_bds_stats(blk_bs(blk), true);

+ s->has_device = true;

+ s->device = g_strdup(blk_name(blk));

+ bdrv_query_blk_stats(s->stats, blk);

+ aio_context_release(ctx);

+

+ info->value = s;

+ *p_next = info;

+ p_next = &info->next;

+ }

}

return head;

2.11.0

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

Current implementation invalidates firstly parent bds and then its

children. This leads to the following bug:

after incoming migration, in bdrv_invalidate_cache_all:

1. invalidate parent bds - reopen it with BDRV_O_INACTIVE cleared

2. child is not yet invalidated

3. parent check that its BDRV_O_INACTIVE is cleared

4. parent writes to child

5. assert in bdrv_co_pwritev, as BDRV_O_INACTIVE is set for child

This patch fixes it by just changing invalidate sequence: invalidate

children first.

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

Message-id: 20170131112308.54189-1-vsementsov@virtuozzo.com

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

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

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

---

block.c | 11 +++++------

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

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

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)

if (!(bs->open_flags & BDRV_O_INACTIVE)) {

return;

}

- bs->open_flags &= ~BDRV_O_INACTIVE;

- if (bs->drv->bdrv_invalidate_cache) {

- bs->drv->bdrv_invalidate_cache(bs, &local_err);

+ QLIST_FOREACH(child, &bs->children, next) {

+ bdrv_invalidate_cache(child->bs, &local_err);

if (local_err) {

- bs->open_flags |= BDRV_O_INACTIVE;

error_propagate(errp, local_err);

return;

- QLIST_FOREACH(child, &bs->children, next) {

- bdrv_invalidate_cache(child->bs, &local_err);

+ bs->open_flags &= ~BDRV_O_INACTIVE;

+ if (bs->drv->bdrv_invalidate_cache) {

+ bs->drv->bdrv_invalidate_cache(bs, &local_err);

if (local_err) {

bs->open_flags |= BDRV_O_INACTIVE;

error_propagate(errp, local_err);

2.11.0

From: Nir Soffer <nirsof@gmail.com>

The result of openfile was not checked, leading to failure deep in the

actual command with confusing error message, and exiting with exit code 0.

Here is a simple example - trying to read with the wrong format:

$ touch file

$ qemu-io -f qcow2 -c 'read -P 1 0 1024' file; echo $?

can't open device file: Image is not in qcow2 format

no file open, try 'help open'

0

With this patch, we fail earlier with exit code 1:

$ ./qemu-io -f qcow2 -c 'read -P 1 0 1024' file; echo $?

can't open device file: Image is not in qcow2 format

1

Failing earlier, we don't log this error now:

no file open, try 'help open'

But some tests expected it; the line was removed from the test output.

Signed-off-by: Nir Soffer <nirsof@gmail.com>

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

Message-id: 20170201003120.23378-2-nirsof@gmail.com

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

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

---

qemu-io.c | 8 ++++++--

tests/qemu-iotests/059.out | 3 ---

tests/qemu-iotests/070.out | 1 -

tests/qemu-iotests/075.out | 7 -------

tests/qemu-iotests/076.out | 3 ---

tests/qemu-iotests/078.out | 6 ------

tests/qemu-iotests/080.out | 18 ------------------

tests/qemu-iotests/083.out | 17 -----------------

tests/qemu-iotests/088.out | 6 ------

tests/qemu-iotests/092.out | 12 ------------

tests/qemu-iotests/116.out | 7 -------

tests/qemu-iotests/131.out | 1 -

tests/qemu-iotests/140.out | 1 -

13 files changed, 6 insertions(+), 84 deletions(-)

diff --git a/qemu-io.c b/qemu-io.c

index XXXXXXX..XXXXXXX 100644

--- a/qemu-io.c

+++ b/qemu-io.c

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

exit(1);

}

opts = qemu_opts_to_qdict(qopts, NULL);

- openfile(NULL, flags, writethrough, opts);

+ if (openfile(NULL, flags, writethrough, opts)) {

+ exit(1);

+ }

} else {

if (format) {

opts = qdict_new();

qdict_put(opts, "driver", qstring_from_str(format));

}

- openfile(argv[optind], flags, writethrough, opts);

+ if (openfile(argv[optind], flags, writethrough, opts)) {

+ exit(1);

+ }

}

}

command_loop();

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ QA output created by 059

=== Testing invalid granularity ===

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

can't open device TEST_DIR/t.vmdk: Invalid granularity, image may be corrupt

-no file open, try 'help open'

=== Testing too big L2 table size ===

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

can't open device TEST_DIR/t.vmdk: L2 table size too big

-no file open, try 'help open'

=== Testing too big L1 table size ===

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

can't open device TEST_DIR/t.vmdk: L1 size too big

-no file open, try 'help open'

=== Testing monolithicFlat creation and opening ===

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ QA output created by 070

can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed

To replay the log, run:

qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'

- no file open, try 'help open'

=== Verify open image replays log ===

read 18874368/18874368 bytes at offset 0

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

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 1048064

== block_size must be a multiple of 512 ==

can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512

-no file open, try 'help open'

== block_size cannot be zero ==

can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero

-no file open, try 'help open'

== huge block_size ===

can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less

-no file open, try 'help open'

== offsets_size overflow ===

can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less

-no file open, try 'help open'

== refuse images that require too many offsets ===

can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size

-no file open, try 'help open'

== refuse images with non-monotonically increasing offsets ==

can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt

-no file open, try 'help open'

== refuse images with invalid compressed block size ==

can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt

-no file open, try 'help open'

*** done

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 0

== Negative catalog size ==

can't open device TEST_DIR/parallels-v1: Catalog too large

-no file open, try 'help open'

== Overflow in catalog allocation ==

can't open device TEST_DIR/parallels-v1: Catalog too large

-no file open, try 'help open'

== Zero sectors per track ==

can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track

-no file open, try 'help open'

== Read from a valid v2 image ==

read 65536/65536 bytes at offset 0

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 0

== Negative catalog size ==

can't open device TEST_DIR/empty.bochs: Catalog size is too large

-no file open, try 'help open'

== Overflow for catalog size * sizeof(uint32_t) ==

can't open device TEST_DIR/empty.bochs: Catalog size is too large

-no file open, try 'help open'

== Too small catalog bitmap for image size ==

can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size

-no file open, try 'help open'

can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size

-no file open, try 'help open'

== Negative extent size ==

can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large

-no file open, try 'help open'

== Zero extent size ==

can't open device TEST_DIR/empty.bochs: Extent size must be at least 512

-no file open, try 'help open'

*** done

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ QA output created by 080

== Huge header size ==

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

can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size

-no file open, try 'help open'

== Huge unknown header extension ==

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

can't open device TEST_DIR/t.qcow2: Invalid backing file offset

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Header extension too large

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Header extension too large

-no file open, try 'help open'

== Huge refcount table size ==

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

can't open device TEST_DIR/t.qcow2: Reference count table too large

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Reference count table too large

-no file open, try 'help open'

== Misaligned refcount table ==

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

can't open device TEST_DIR/t.qcow2: Invalid reference count table offset

-no file open, try 'help open'

== Huge refcount offset ==

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

can't open device TEST_DIR/t.qcow2: Invalid reference count table offset

-no file open, try 'help open'

== Invalid snapshot table ==

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

can't open device TEST_DIR/t.qcow2: Too many snapshots

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Too many snapshots

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Invalid snapshot table offset

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Invalid snapshot table offset

-no file open, try 'help open'

== Hitting snapshot table size limit ==

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

@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 0

== Invalid L1 table ==

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

can't open device TEST_DIR/t.qcow2: Active L1 table too large

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Active L1 table too large

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Invalid L1 table offset

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow2: Invalid L1 table offset

-no file open, try 'help open'

== Invalid L1 table (with internal snapshot in the image) ==

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

@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small

== Invalid backing file size ==

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

can't open device TEST_DIR/t.qcow2: Backing file name too long

-no file open, try 'help open'

== Invalid L2 entry (huge physical offset) ==

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

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ QA output created by 083

=== Check disconnect before neg1 ===

can't open device nbd:127.0.0.1:PORT:exportname=foo