From: QingFeng Hao <haoqf@linux.vnet.ibm.com>

If TEST_DIR is set to /tmp, test case 144 will fail. The reason is that

TEST_DIR resembles 144's test image name tmp.qcow2.

When 144 is testing $TEST_DIR/tmp.qcow2, it wants to replace

$TEST_DIR/tmp.qcow2 to TEST_DIR/tmp.qcow2, but actually it will fail

and get TEST_DIRTEST_DIR.qcow2 in this case.

The fix is just to modify the code to replace $TEST_DIR/ with TEST_DIR/.

Signed-off-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>

Message-id: 20161216054723.96055-2-haoqf@linux.vnet.ibm.com

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

[mreitz: Fixed commit message and dropped superfluous escaping]

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

---

tests/qemu-iotests/common.filter | 2 +-

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

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/common.filter

+++ b/tests/qemu-iotests/common.filter

@@ -XXX,XX +XXX,XX @@ _filter_generated_node_ids()

# replace occurrences of the actual TEST_DIR value with TEST_DIR

_filter_testdir()

{

- sed -e "s#$TEST_DIR#TEST_DIR#g"

+ sed -e "s#$TEST_DIR/#TEST_DIR/#g"

}

# replace occurrences of the actual IMGFMT value with IMGFMT

--

2.11.0

When trying to invoke qemu-img commit with a base image file name that

is not part of the top image's backing chain, the user receives a rather

plain "Base not found" error message. This is not really helpful because

it does not explain what "not found" means, potentially leaving the user

wondering why qemu cannot find a file despite it clearly existing in the

file system.

Improve the error message by clarifying that "not found" means "not

found in the top image's backing chain".

Reported-by: Ala Hino <ahino@redhat.com>

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

Message-id: 20161201020508.24417-1-mreitz@redhat.com

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

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

---

qemu-img.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/qemu-img.c

+++ b/qemu-img.c

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

if (base) {

base_bs = bdrv_find_backing_image(bs, base);

if (!base_bs) {

- error_setg(&local_err, QERR_BASE_NOT_FOUND, base);

+ error_setg(&local_err,

+ "Did not find '%s' in the backing chain of '%s'",

+ base, filename);

goto done;

}

} else {

--

2.11.0

From: Fam Zheng <famz@redhat.com>

@bs doesn't always have a device name, such as when it comes from

"qemu-img info". Report file name instead.

Signed-off-by: Fam Zheng <famz@redhat.com>

Message-id: 20170119130759.28319-2-famz@redhat.com

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

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

---

block/qapi.c | 4 ++--

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

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qapi.c

+++ b/block/qapi.c

@@ -XXX,XX +XXX,XX @@ void bdrv_query_image_info(BlockDriverState *bs,

size = bdrv_getlength(bs);

if (size < 0) {

- error_setg_errno(errp, -size, "Can't get size of device '%s'",

- bdrv_get_device_name(bs));

+ error_setg_errno(errp, -size, "Can't get image size '%s'",

+ bs->exact_filename);

goto out;

}

--

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

index XXXXXXX..XXXXXXX 100644

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

index XXXXXXX..XXXXXXX 100644

--- 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: Peter Lieven <pl@kamp.de>

commit 94d6a7a accidentally left the naming of runtime opts and QAPI

scheme inconsistent. As one consequence passing of parameters in the

URI is broken. Sync the naming of the runtime opts to the QAPI

scheme.

Please note that this is technically backwards incompatible with the 2.8

release, but the 2.8 release is the only version that had the wrong naming.

Furthermore release 2.8 suffered from a NULL pointer dereference during

URI parsing.

Fixes: 94d6a7a76e9df9919629428f6c598e2b97d9426c

Cc: qemu-stable@nongnu.org

Signed-off-by: Peter Lieven <pl@kamp.de>

Message-id: 1485942829-10756-3-git-send-email-pl@kamp.de

[mreitz: Fixed commit message]

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

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

---

block/nfs.c | 46 +++++++++++++++++++++++-----------------------

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

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

index XXXXXXX..XXXXXXX 100644

--- a/block/nfs.c

+++ b/block/nfs.c

@@ -XXX,XX +XXX,XX @@ static QemuOptsList runtime_opts = {

.help = "Path of the image on the host",

},

{

- .name = "uid",

+ .name = "user",

.type = QEMU_OPT_NUMBER,

.help = "UID value to use when talking to the server",

},

{

- .name = "gid",

+ .name = "group",

.type = QEMU_OPT_NUMBER,

.help = "GID value to use when talking to the server",

},

{

- .name = "tcp-syncnt",

+ .name = "tcp-syn-count",

.type = QEMU_OPT_NUMBER,

.help = "Number of SYNs to send during the session establish",

},

{

- .name = "readahead",

+ .name = "readahead-size",

.type = QEMU_OPT_NUMBER,

.help = "Set the readahead size in bytes",

},

{

- .name = "pagecache",

+ .name = "page-cache-size",

.type = QEMU_OPT_NUMBER,

.help = "Set the pagecache size in bytes",

},

@@ -XXX,XX +XXX,XX @@ static int64_t nfs_client_open(NFSClient *client, QDict *options,

goto fail;

}

- if (qemu_opt_get(opts, "uid")) {

- client->uid = qemu_opt_get_number(opts, "uid", 0);

+ if (qemu_opt_get(opts, "user")) {

+ client->uid = qemu_opt_get_number(opts, "user", 0);

nfs_set_uid(client->context, client->uid);

}

- if (qemu_opt_get(opts, "gid")) {

- client->gid = qemu_opt_get_number(opts, "gid", 0);

+ if (qemu_opt_get(opts, "group")) {

+ client->gid = qemu_opt_get_number(opts, "group", 0);

nfs_set_gid(client->context, client->gid);

}

- if (qemu_opt_get(opts, "tcp-syncnt")) {

- client->tcp_syncnt = qemu_opt_get_number(opts, "tcp-syncnt", 0);

+ if (qemu_opt_get(opts, "tcp-syn-count")) {

+ client->tcp_syncnt = qemu_opt_get_number(opts, "tcp-syn-count", 0);

nfs_set_tcp_syncnt(client->context, client->tcp_syncnt);

}

#ifdef LIBNFS_FEATURE_READAHEAD

- if (qemu_opt_get(opts, "readahead")) {

+ if (qemu_opt_get(opts, "readahead-size")) {

if (open_flags & BDRV_O_NOCACHE) {

error_setg(errp, "Cannot enable NFS readahead "

"if cache.direct = on");

goto fail;

}

- client->readahead = qemu_opt_get_number(opts, "readahead", 0);

+ client->readahead = qemu_opt_get_number(opts, "readahead-size", 0);

if (client->readahead > QEMU_NFS_MAX_READAHEAD_SIZE) {

error_report("NFS Warning: Truncating NFS readahead "

"size to %d", QEMU_NFS_MAX_READAHEAD_SIZE);

@@ -XXX,XX +XXX,XX @@ static int64_t nfs_client_open(NFSClient *client, QDict *options,

#endif

#ifdef LIBNFS_FEATURE_PAGECACHE

- if (qemu_opt_get(opts, "pagecache")) {

+ if (qemu_opt_get(opts, "page-cache-size")) {

if (open_flags & BDRV_O_NOCACHE) {

error_setg(errp, "Cannot enable NFS pagecache "

"if cache.direct = on");

goto fail;

}

- client->pagecache = qemu_opt_get_number(opts, "pagecache", 0);

+ client->pagecache = qemu_opt_get_number(opts, "page-cache-size", 0);

if (client->pagecache > QEMU_NFS_MAX_PAGECACHE_SIZE) {

error_report("NFS Warning: Truncating NFS pagecache "

"size to %d pages", QEMU_NFS_MAX_PAGECACHE_SIZE);

@@ -XXX,XX +XXX,XX @@ static void nfs_refresh_filename(BlockDriverState *bs, QDict *options)

qdict_put(opts, "path", qstring_from_str(client->path));

if (client->uid) {

- qdict_put(opts, "uid", qint_from_int(client->uid));

+ qdict_put(opts, "user", qint_from_int(client->uid));

}

if (client->gid) {

- qdict_put(opts, "gid", qint_from_int(client->gid));

+ qdict_put(opts, "group", qint_from_int(client->gid));

}

if (client->tcp_syncnt) {

- qdict_put(opts, "tcp-syncnt",

- qint_from_int(client->tcp_syncnt));

+ qdict_put(opts, "tcp-syn-cnt",

+ qint_from_int(client->tcp_syncnt));

}

if (client->readahead) {

- qdict_put(opts, "readahead",

- qint_from_int(client->readahead));

+ qdict_put(opts, "readahead-size",

+ qint_from_int(client->readahead));

}

if (client->pagecache) {

- qdict_put(opts, "pagecache",

- qint_from_int(client->pagecache));

+ qdict_put(opts, "page-cache-size",

+ qint_from_int(client->pagecache));

}

if (client->debug) {

qdict_put(opts, "debug", qint_from_int(client->debug));

--

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

-no file open, try 'help open'

=== Check disconnect after neg1 ===

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

-no file open, try 'help open'

=== Check disconnect 8 neg1 ===

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

-no file open, try 'help open'

=== Check disconnect 16 neg1 ===

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

-no file open, try 'help open'

=== Check disconnect before export ===

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

-no file open, try 'help open'

=== Check disconnect after export ===

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

-no file open, try 'help open'

=== Check disconnect 4 export ===

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

-no file open, try 'help open'

=== Check disconnect 12 export ===

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

-no file open, try 'help open'

=== Check disconnect 16 export ===

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

-no file open, try 'help open'

=== Check disconnect before neg2 ===

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

-no file open, try 'help open'

=== Check disconnect after neg2 ===

@@ -XXX,XX +XXX,XX @@ read failed: Input/output error

=== Check disconnect 8 neg2 ===

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

-no file open, try 'help open'

=== Check disconnect 10 neg2 ===

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

-no file open, try 'help open'

=== Check disconnect before request ===

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

=== Check disconnect before neg-classic ===

can't open device nbd:127.0.0.1:PORT

-no file open, try 'help open'

=== Check disconnect 8 neg-classic ===

can't open device nbd:127.0.0.1:PORT

-no file open, try 'help open'

=== Check disconnect 16 neg-classic ===

can't open device nbd:127.0.0.1:PORT

-no file open, try 'help open'

=== Check disconnect 24 neg-classic ===

can't open device nbd:127.0.0.1:PORT

-no file open, try 'help open'

=== Check disconnect 28 neg-classic ===

can't open device nbd:127.0.0.1:PORT

-no file open, try 'help open'

=== Check disconnect after neg-classic ===

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

index XXXXXXX..XXXXXXX 100644

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

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

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

== Invalid block size ==

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

can't open device TEST_DIR/t.vpc: Invalid block size 0

-no file open, try 'help open'

can't open device TEST_DIR/t.vpc: Invalid block size 0

-no file open, try 'help open'

can't open device TEST_DIR/t.vpc: Invalid block size 128

-no file open, try 'help open'

can't open device TEST_DIR/t.vpc: Invalid block size 128

-no file open, try 'help open'

can't open device TEST_DIR/t.vpc: Invalid block size 305419896

-no file open, try 'help open'

can't open device TEST_DIR/t.vpc: Invalid block size 305419896

-no file open, try 'help open'

*** done

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

index XXXXXXX..XXXXXXX 100644

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

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

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

== Invalid cluster size ==

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

can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k

-no file open, try 'help open'

== Invalid L2 table size ==

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

can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k

-no file open, try 'help open'

== Invalid size ==

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

can't open device TEST_DIR/t.qcow: Image too large

-no file open, try 'help open'

can't open device TEST_DIR/t.qcow: Image too large

-no file open, try 'help open'

== Invalid backing file length ==

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

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

-no file open, try 'help open'

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

-no file open, try 'help open'

*** done

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

index XXXXXXX..XXXXXXX 100644

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

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

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

== truncated header cluster ==

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

can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument

-no file open, try 'help open'

== invalid header magic ==

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

can't open device TEST_DIR/t.qed: Image not in QED format

-no file open, try 'help open'

== invalid cluster size ==

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

can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument

-no file open, try 'help open'

== invalid table size ==

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

can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument

-no file open, try 'help open'

== invalid header size ==

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

can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument

-no file open, try 'help open'

== invalid L1 table offset ==

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

can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument

-no file open, try 'help open'

== invalid image size ==

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

can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument

-no file open, try 'help open'

*** done

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

index XXXXXXX..XXXXXXX 100644

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

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

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

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

== Corrupt image ==

can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write

-no file open, try 'help open'

ERROR image was not closed correctly

1 errors were found on the image.

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

index XXXXXXX..XXXXXXX 100644

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

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

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

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

{"return": {}}

can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: No export with name 'drv' available

-no file open, try 'help open'

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}

*** done

--

2.11.0

From: Nir Soffer <nirsof@gmail.com>

This helper allows adding tests supporting any format expect the

specified formats. This may be useful to test that many formats behave

in a common way.

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

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

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

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

---

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

1 file changed, 11 insertions(+)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc

index XXXXXXX..XXXXXXX 100644

--- a/tests/qemu-iotests/common.rc

+++ b/tests/qemu-iotests/common.rc

@@ -XXX,XX +XXX,XX @@ _supported_fmt()

_notrun "not suitable for this image format: $IMGFMT"

}

+# tests whether $IMGFMT is one of the unsupported image format for a test

+#

+_unsupported_fmt()

+{

+ for f; do

+ if [ "$f" = "$IMGFMT" ]; then

+ _notrun "not suitable for this image format: $IMGFMT"

+ fi

+ done

+}

+

# tests whether $IMGPROTO is one of the supported image protocols for a test

#

_supported_proto()

--

2.11.0

From: Nir Soffer <nirsof@gmail.com>

Add regression tests checking that qemu-io fails with non-zero exit code

when reading non-existing file or using the wrong image format.

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

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

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

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

---

tests/qemu-iotests/174 | 59 ++++++++++++++++++++++++++++++++++++++++++++++