The following changes since commit 81b2d5ceb0cfb4cdc2163492e3169ed714b0cda9:

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170426' into staging (2017-04-26 20:50:49 +0100)

are available in the git repository at:

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to 5fc0fe383fff318b38291dcdf2cf38e329ec232a:

Merge remote-tracking branch 'mreitz/tags/pull-block-2017-04-28' into queue-block (2017-04-28 20:52:17 +0200)

Denis V. Lunev (2):

block: fix alignment calculations in bdrv_co_do_zero_pwritev

block: assert no image modification under BDRV_O_INACTIVE

Eric Blake (2):

iotests: Fix typo in 026

qcow2: Allow discard of final unaligned cluster

Fam Zheng (2):

block: Remove NULL check in bdrv_co_flush

iotests: 109: Filter out "len" of failed jobs

John Snow (2):

iotests: clarify help text

iotests: fix exclusion option

Kevin Wolf (8):

file-posix: Remove unnecessary includes

file-win32: Remove unnecessary include

migration: Call blk_resume_after_migration() for postcopy

qemu-iotests: Filter HMP readline escape characters

qemu-iotests: Test postcopy migration

qemu-iotests: Remove PERL_PROG and BC_PROG

qemu_iotests: Remove _readlink()

Merge remote-tracking branch 'mreitz/tags/pull-block-2017-04-28' into queue-block

Klim Kireev (1):

block: fix obvious coding style mistakes in block_int.h

Krzysztof Kozlowski (1):

block: Constify data passed by pointer to blk_name

Lidong Chen (1):

qemu-img: use blk_co_pwrite_zeroes for zero sectors when compressed

Max Reitz (13):

Revert "block/io: Comment out permission assertions"

block: An empty filename counts as no filename

iotests/051: Add test for empty filename

iotests: Launch qemu-nbd with -e 42

block: Do not unref bs->file on error in BD's open

qemu-img/convert: Use @opts for one thing only

qemu-img/convert: Move bs_n > 1 && -B check down

qemu-img: Document backing options

block/vhdx: Make vhdx_create() always set errp

block: Add errp to b{lk,drv}_truncate()

block: Add errp to BD.bdrv_truncate()

block: Add .bdrv_truncate() error messages

progress: Show current progress on SIGINFO

Peter Lieven (1):

qemu-img: simplify img_convert

Issue a deprecation warning if the user specifies the "-hdachs" option.

Vladimir Sementsov-Ogievskiy (1):

qemu-img: improve convert_iteration_sectors()

block.c | 26 +--

block/blkdebug.c | 8 +-

block/blkreplay.c | 3 -

block/blkverify.c | 3 -

block/block-backend.c | 7 +-

block/commit.c | 5 +-

block/crypto.c | 5 +-

block/file-posix.c | 21 ++-

block/file-win32.c | 7 +-

block/gluster.c | 7 +-

block/io.c | 16 +-

block/iscsi.c | 6 +-

block/mirror.c | 2 +-

block/nfs.c | 12 +-

block/parallels.c | 13 +-

block/qcow.c | 6 +-

block/qcow2-refcount.c | 5 +-

block/qcow2.c | 31 ++--

block/qed.c | 8 +-

block/raw-format.c | 6 +-

block/rbd.c | 3 +-

block/sheepdog.c | 14 +-

block/vdi.c | 4 +-

block/vhdx-log.c | 2 +-

block/vhdx.c | 25 ++-

block/vmdk.c | 13 +-

block/vpc.c | 13 +-

blockdev.c | 21 +--

include/block/block.h | 2 +-

include/block/block_int.h | 8 +-

include/sysemu/block-backend.h | 4 +-

migration/savevm.c | 8 +

qemu-img-cmds.hx | 8 +-

qemu-img.c | 313 ++++++++++++++-----------------------

qemu-img.texi | 7 +-

qemu-io-cmds.c | 5 +-

qemu-options.hx | 4 +-

tests/qemu-iotests/026 | 2 +-

tests/qemu-iotests/026.out | 2 +-

tests/qemu-iotests/026.out.nocache | 2 +-

tests/qemu-iotests/028.out | 2 +-

tests/qemu-iotests/051 | 4 +-

tests/qemu-iotests/051.out | 109 ++++++-------

tests/qemu-iotests/051.pc.out | 135 ++++++++--------

tests/qemu-iotests/066 | 12 +-

tests/qemu-iotests/066.out | 12 +-

tests/qemu-iotests/068 | 4 +-

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

tests/qemu-iotests/109 | 6 +-

tests/qemu-iotests/109.out | 20 +--

tests/qemu-iotests/122.out | 4 +-

tests/qemu-iotests/130.out | 4 +-

tests/qemu-iotests/142 | 2 +-

tests/qemu-iotests/142.out | 10 +-

tests/qemu-iotests/145 | 3 +-

tests/qemu-iotests/145.out | 2 +-

tests/qemu-iotests/181 | 119 ++++++++++++++

tests/qemu-iotests/181.out | 38 +++++

tests/qemu-iotests/common | 11 +-

tests/qemu-iotests/common.config | 24 ---

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

tests/qemu-iotests/common.qemu | 4 +-

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

tests/qemu-iotests/group | 1 +

util/qemu-progress.c | 3 +

vl.c | 2 +

66 files changed, 669 insertions(+), 542 deletions(-)

create mode 100755 tests/qemu-iotests/181

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

From: Krzysztof Kozlowski <krzk@kernel.org>

blk_name() is not modifying data passed to it through pointer and it

returns also a pointer to const so the argument can be made const for

code safeness.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

block/block-backend.c | 2 +-

include/sysemu/block-backend.h | 2 +-

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

@@ -XXX,XX +XXX,XX @@ void monitor_remove_blk(BlockBackend *blk)

* Return @blk's name, a non-null string.

* Returns an empty string iff @blk is not referenced by the monitor.

*/

-const char *blk_name(BlockBackend *blk)

+const char *blk_name(const BlockBackend *blk)

{

return blk->name ?: "";

diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h

index XXXXXXX..XXXXXXX 100644

--- a/include/sysemu/block-backend.h

+++ b/include/sysemu/block-backend.h

@@ -XXX,XX +XXX,XX @@ int blk_get_refcnt(BlockBackend *blk);

void blk_ref(BlockBackend *blk);

void blk_unref(BlockBackend *blk);

void blk_remove_all_bs(void);

-const char *blk_name(BlockBackend *blk);

+const char *blk_name(const BlockBackend *blk);

BlockBackend *blk_by_name(const char *name);

BlockBackend *blk_next(BlockBackend *blk);

bool monitor_add_blk(BlockBackend *blk, const char *name, Error **errp);

1.8.3.1

From: Max Reitz <mreitz@redhat.com>

The create and convert subcommands have shorthands to set the

backing_file and, in the case of create, the backing_fmt options for the

new image. However, they have not been documented so far, which is

remedied by this patch.

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

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

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

qemu-img-cmds.hx | 8 ++++----

qemu-img.texi | 4 ++--

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

diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx

--- a/qemu-img-cmds.hx

+++ b/qemu-img-cmds.hx

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

ETEXI

DEF("create", img_create,

- "create [-q] [--object objectdef] [-f fmt] [-o options] filename [size]")

+ "create [-q] [--object objectdef] [-f fmt] [-b backing_file] [-F backing_fmt] [-o options] filename [size]")

STEXI

-@item create [--object @var{objectdef}] [-q] [-f @var{fmt}] [-o @var{options}] @var{filename} [@var{size}]

+@item create [--object @var{objectdef}] [-q] [-f @var{fmt}] [-b @var{backing_file}] [-F @var{backing_fmt}] [-o @var{options}] @var{filename} [@var{size}]

ETEXI

DEF("commit", img_commit,

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

ETEXI

DEF("convert", img_convert,

- "convert [--object objectdef] [--image-opts] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")

+ "convert [--object objectdef] [--image-opts] [-c] [-p] [-q] [-n] [-f fmt] [-t cache] [-T src_cache] [-O output_fmt] [-B backing_file] [-o options] [-s snapshot_id_or_name] [-l snapshot_param] [-S sparse_size] [-m num_coroutines] [-W] filename [filename2 [...]] output_filename")

STEXI

-@item convert [--object @var{objectdef}] [--image-opts] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}

+@item convert [--object @var{objectdef}] [--image-opts] [-c] [-p] [-q] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}

ETEXI

DEF("dd", img_dd,

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

index XXXXXXX..XXXXXXX 100644

--- a/qemu-img.texi

+++ b/qemu-img.texi

@@ -XXX,XX +XXX,XX @@ If @code{-r} is specified, exit codes representing the image state refer to the

state after (the attempt at) repairing it. That is, a successful @code{-r all}

will yield the exit code 0, independently of the image state before.

-@item create [-f @var{fmt}] [-o @var{options}] @var{filename} [@var{size}]

+@item create [-f @var{fmt}] [-b @var{backing_file}] [-F @var{backing_fmt}] [-o @var{options}] @var{filename} [@var{size}]

Create the new disk image @var{filename} of size @var{size} and format

@var{fmt}. Depending on the file format, you can add one or more @var{options}

@@ -XXX,XX +XXX,XX @@ Error on reading data

@end table

-@item convert [-c] [-p] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-m @var{num_coroutines}] [-W] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}

+@item convert [-c] [-p] [-n] [-f @var{fmt}] [-t @var{cache}] [-T @var{src_cache}] [-O @var{output_fmt}] [-B @var{backing_file}] [-o @var{options}] [-s @var{snapshot_id_or_name}] [-l @var{snapshot_param}] [-m @var{num_coroutines}] [-W] [-S @var{sparse_size}] @var{filename} [@var{filename2} [...]] @var{output_filename}

Convert the disk image @var{filename} or a snapshot @var{snapshot_param}(@var{snapshot_id_or_name} is deprecated)

to disk image @var{output_filename} using format @var{output_fmt}. It can be optionally compressed (@code{-c}

1.8.3.1

From: Max Reitz <mreitz@redhat.com>

Add missing error messages for the block driver implementations of

.bdrv_truncate(); drop the generic one from block.c's bdrv_truncate().

Since one of these changes touches a mis-indented block in

block/file-posix.c, this patch fixes that coding style issue along the

way.

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

Message-id: 20170328205129.15138-5-mreitz@redhat.com

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

block.c | 2 --

block/file-posix.c | 17 ++++++++++++-----

block/gluster.c | 4 +++-

block/iscsi.c | 2 ++

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

block/qcow2.c | 2 ++

block/qed.c | 4 +++-

block/raw-format.c | 2 ++

block/rbd.c | 1 +

9 files changed, 34 insertions(+), 10 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, Error **errp)

bdrv_dirty_bitmap_truncate(bs);

bdrv_parent_cb_resize(bs);

++bs->write_gen;

- } else if (errp && !*errp) {

- error_setg_errno(errp, -ret, "Failed to resize image");

}

return ret;

}

@@ -XXX,XX +XXX,XX @@ static int raw_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

{

BDRVRawState *s = bs->opaque;

struct stat st;

+ int ret;

if (fstat(s->fd, &st)) {

- return -errno;

+ ret = -errno;

+ error_setg_errno(errp, -ret, "Failed to fstat() the file");

+ return ret;

}

if (S_ISREG(st.st_mode)) {

if (ftruncate(s->fd, offset) < 0) {

- return -errno;

+ ret = -errno;

+ error_setg_errno(errp, -ret, "Failed to resize the file");

+ return ret;

}

} else if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {

- if (offset > raw_getlength(bs)) {

- return -EINVAL;

- }

+ if (offset > raw_getlength(bs)) {

+ error_setg(errp, "Cannot grow device files");

+ return -EINVAL;

+ }

} else {

+ error_setg(errp, "Resizing this file is not supported");

return -ENOTSUP;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/gluster.c

+++ b/block/gluster.c

@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_truncate(BlockDriverState *bs, int64_t offset,

ret = glfs_ftruncate(s->fd, offset);

if (ret < 0) {

- return -errno;

+ ret = -errno;

+ error_setg_errno(errp, -ret, "Failed to truncate file");

+ return ret;

}

return 0;

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

index XXXXXXX..XXXXXXX 100644

--- a/block/iscsi.c

+++ b/block/iscsi.c

@@ -XXX,XX +XXX,XX @@ static int iscsi_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

Error *local_err = NULL;

if (iscsilun->type != TYPE_DISK) {

+ error_setg(errp, "Cannot resize non-disk iSCSI devices");

return -ENOTSUP;

}

@@ -XXX,XX +XXX,XX @@ static int iscsi_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

}

if (offset > iscsi_getlength(bs)) {

+ error_setg(errp, "Cannot grow iSCSI devices");

return -EINVAL;

}

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 int64_t nfs_get_allocated_file_size(BlockDriverState *bs)

static int nfs_file_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

{

NFSClient *client = bs->opaque;

- return nfs_ftruncate(client->context, client->fh, offset);

+ int ret;

+

+ ret = nfs_ftruncate(client->context, client->fh, offset);

+ if (ret < 0) {

+ error_setg_errno(errp, -ret, "Failed to truncate file");

+ return ret;

+ return 0;

}

/* Note that this will not re-establish a connection with the NFS server

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

new_l1_size = size_to_l1(s, offset);

ret = qcow2_grow_l1_table(bs, new_l1_size, true);

+ error_setg_errno(errp, -ret, "Failed to grow the L1 table");

@@ -XXX,XX +XXX,XX @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size),

&offset, sizeof(uint64_t));

if (ret < 0) {

+ error_setg_errno(errp, -ret, "Failed to update the image size");

return ret;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qed.c

+++ b/block/qed.c

@@ -XXX,XX +XXX,XX @@ static int bdrv_qed_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

if (!qed_is_image_size_valid(offset, s->header.cluster_size,

s->header.table_size)) {

+ error_setg(errp, "Invalid image size specified");

return -EINVAL;

}

- /* Shrinking is currently not supported */

if ((uint64_t)offset < s->header.image_size) {

+ error_setg(errp, "Shrinking images is currently not supported");

return -ENOTSUP;

}

@@ -XXX,XX +XXX,XX @@ static int bdrv_qed_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

ret = qed_write_header_sync(s);

if (ret < 0) {

s->header.image_size = old_image_size;

+ error_setg_errno(errp, -ret, "Failed to update the image size");

}

return ret;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/raw-format.c

+++ b/block/raw-format.c

@@ -XXX,XX +XXX,XX @@ static int raw_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

BDRVRawState *s = bs->opaque;

if (s->has_size) {

+ error_setg(errp, "Cannot resize fixed-size raw disks");

return -ENOTSUP;

}

if (INT64_MAX - offset < s->offset) {

+ error_setg(errp, "Disk size too large for the chosen offset");

return -EINVAL;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/block/rbd.c

+++ b/block/rbd.c

@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

r = rbd_resize(s->image, offset);

if (r < 0) {

+ error_setg_errno(errp, -r, "Failed to resize file");

return r;

}

1.8.3.1

From: Fam Zheng <famz@redhat.com>

Reported by Coverity. We already use bs in bdrv_inc_in_flight before

checking for NULL. It is unnecessary as all callers pass non-NULL bs, so

drop it.

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

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

block/io.c | 2 +-

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

@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs)

bdrv_inc_in_flight(bs);

- if (!bs || !bdrv_is_inserted(bs) || bdrv_is_read_only(bs) ||

+ if (!bdrv_is_inserted(bs) || bdrv_is_read_only(bs) ||

bdrv_is_sg(bs)) {

goto early_exit;

1.8.3.1

From: "Denis V. Lunev" <den@openvz.org>

As long as BDRV_O_INACTIVE is set, the image file is only opened so we

have a file descriptor for it. We're definitely not supposed to modify

the image, it's still owned by the migration source.

This commit is an addition to 09e0c771 but the assert() is added to

bdrv_truncate().

Signed-off-by: Denis V. Lunev <den@openvz.org>

CC: Kevin Wolf <kwolf@redhat.com>

CC: Max Reitz <mreitz@redhat.com>

Message-id: 1491405505-31620-3-git-send-email-den@openvz.org

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

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

---

block.c | 2 ++

1 file changed, 2 insertions(+)

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

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, Error **errp)

return -EACCES;

+ assert(!(bs->open_flags & BDRV_O_INACTIVE));

ret = drv->bdrv_truncate(bs, offset, errp);

if (ret == 0) {

ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);

1.8.3.1

The only thing the escape characters achieve is making the reference

output unreadable and lines that are potentially so long that git

doesn't want to put them into an email any more. Let's filter them out.

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

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

---

tests/qemu-iotests/028.out | 2 +-

tests/qemu-iotests/051 | 3 +-

tests/qemu-iotests/051.out | 106 +++++++++++++++----------------

tests/qemu-iotests/051.pc.out | 132 +++++++++++++++++++--------------------

tests/qemu-iotests/068 | 4 +-

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

tests/qemu-iotests/130.out | 4 +-

tests/qemu-iotests/142 | 2 +-

tests/qemu-iotests/142.out | 10 +--

tests/qemu-iotests/145 | 3 +-

tests/qemu-iotests/145.out | 2 +-

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

tests/qemu-iotests/common.qemu | 4 +-

13 files changed, 147 insertions(+), 138 deletions(-)

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

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

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

@@ -XXX,XX +XXX,XX @@ No errors were found on the image.

block-backup

Formatting 'TEST_DIR/t.IMGFMT.copy', fmt=IMGFMT size=4294968832 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block-info block-jinfo block-joinfo block-jobinfo block-jobs

+(qemu) info block-jobs

No active jobs

=== IO: pattern 195

read 512/512 bytes at offset 3221194240

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 @@ function do_run_qemu()

function run_qemu()

{

- do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_generated_node_ids

+ do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu |

+ _filter_generated_node_ids | _filter_hmp

size=128M

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information

Testing: -drive file=TEST_DIR/t.qcow2,driver=qcow2,backing.file.filename=TEST_DIR/t.qcow2.orig,if=none,id=drive0 -nodefaults

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo block

+(qemu) info block

drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)

Removable device: not locked, tray closed

Cache mode: writeback

Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1)

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,driver=raw,backing.file.filename=TEST_DIR/t.qcow2.orig

QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=raw,backing.file.filename=TEST_DIR/t.qcow2.orig: Driver doesn't support backing files

@@ -XXX,XX +XXX,XX @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,file.backing.driver=qcow2,file.backing.f

Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=on

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=off

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=

QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=: Parameter 'lazy-refcounts' expects 'on' or 'off'

@@ -XXX,XX +XXX,XX @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=on: Lazy ref

Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,lazy-refcounts=off

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

=== No medium ===

@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information

Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

=== Cache modes ===

Testing: -drive driver=null-co,cache=none

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive driver=null-co,cache=directsync

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive driver=null-co,cache=writeback

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive driver=null-co,cache=writethrough

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive driver=null-co,cache=unsafe

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive driver=null-co,cache=invalid_value

QEMU_PROG: -drive driver=null-co,cache=invalid_value: invalid cache option

Testing: -drive file=TEST_DIR/t.qcow2,cache=writeback,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo block

+(qemu) info block

drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)

Removable device: not locked, tray closed

Cache mode: writeback

Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block finfo block fiinfo block filinfo block file

+(qemu) info block file

file: TEST_DIR/t.qcow2 (file)

Cache mode: writeback

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block binfo block bainfo block bacinfo block backinfo block backiinfo block backininfo block backing

+(qemu) info block backing

backing: TEST_DIR/t.qcow2.base (qcow2, read-only)

Cache mode: writeback, ignore flushes

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block binfo block bainfo block bacinfo block backinfo block backiinfo block backininfo block backinginfo block backing-info block backing-finfo block backing-fiinf

o block backing-filinfo block backing-file

+(qemu) info block backing-file

backing-file: TEST_DIR/t.qcow2.base (file, read-only)

Cache mode: writeback, ignore flushes

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,cache=writethrough,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo block

+(qemu) info block

drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)

Removable device: not locked, tray closed

Cache mode: writethrough

Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block finfo block fiinfo block filinfo block file

+(qemu) info block file

file: TEST_DIR/t.qcow2 (file)

Cache mode: writeback

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block binfo block bainfo block bacinfo block backinfo block backiinfo block backininfo block backing

+(qemu) info block backing

backing: TEST_DIR/t.qcow2.base (qcow2, read-only)

Cache mode: writeback, ignore flushes

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block binfo block bainfo block bacinfo block backinfo block backiinfo block backininfo block backinginfo block backing-info block backing-finfo block backing-fiinf

o block backing-filinfo block backing-file

+(qemu) info block backing-file

backing-file: TEST_DIR/t.qcow2.base (file, read-only)

Cache mode: writeback, ignore flushes

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,cache=unsafe,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo block

+(qemu) info block

drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)

Removable device: not locked, tray closed

Cache mode: writeback, ignore flushes

Backing file: TEST_DIR/t.qcow2.base (chain depth: 1)

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block finfo block fiinfo block filinfo block file

+(qemu) info block file

file: TEST_DIR/t.qcow2 (file)

Cache mode: writeback, ignore flushes

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block binfo block bainfo block bacinfo block backinfo block backiinfo block backininfo block backing

+(qemu) info block backing

backing: TEST_DIR/t.qcow2.base (qcow2, read-only)

Cache mode: writeback, ignore flushes

-(qemu) iininfinfoinfo info binfo blinfo bloinfo blocinfo blockinfo block info block binfo block bainfo block bacinfo block backinfo block backiinfo block backininfo block backinginfo block backing-info block backing-finfo block backing-fiinf

o block backing-filinfo block backing-file

+(qemu) info block backing-file

backing-file: TEST_DIR/t.qcow2.base (file, read-only)

Cache mode: writeback, ignore flushes

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,cache=invalid_value,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0 -nodefaults

QEMU_PROG: -drive file=TEST_DIR/t.qcow2,cache=invalid_value,backing.file.filename=TEST_DIR/t.qcow2.base,backing.cache.no-flush=on,backing.node-name=backing,backing.file.node-name=backing-file,file.node-name=file,if=none,id=drive0: invalid cache option

@@ -XXX,XX +XXX,XX @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,cache=invalid_value,backing.file.filenam

Testing: -drive file=TEST_DIR/t.qcow2,file.driver=file

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

=== Leaving out required options ===

@@ -XXX,XX +XXX,XX @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,throttling.bps-total=-5: bps/iops/max va

Testing: -drive file=TEST_DIR/t.qcow2,bps=0

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,bps=1

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,bps=1000000000000000

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,bps=1000000000000001

QEMU_PROG: -drive file=TEST_DIR/t.qcow2,bps=1000000000000001: bps/iops/max values must be within [0, 1000000000000000]

@@ -XXX,XX +XXX,XX @@ QEMU_PROG: -drive file.filename=foo:bar: Could not open 'foo:bar': No such file

Testing: -hda file:TEST_DIR/t.qcow2

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=file:TEST_DIR/t.qcow2

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file.filename=file:TEST_DIR/t.qcow2

QEMU_PROG: -drive file.filename=file:TEST_DIR/t.qcow2: Could not open 'file:TEST_DIR/t.qcow2': No such file or directory

@@ -XXX,XX +XXX,XX @@ wrote 4096/4096 bytes at offset 0

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

Testing: -drive file=TEST_DIR/t.qcow2,if=none,id=drive0 -snapshot

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io drqemu-io driqemu-io drivqemu-io driveqemu-io drive0qemu-io drive0 qemu-io drive0 "qemu-io drive0 "wqemu-io drive0 "wrqemu-io drive0 "wriqemu-io drive0 "writqemu-io drive0 "writeqem

u-io drive0 "write qemu-io drive0 "write -qemu-io drive0 "write -Pqemu-io drive0 "write -P qemu-io drive0 "write -P 0qemu-io drive0 "write -P 0xqemu-io drive0 "write -P 0x2qemu-io drive0 "write -P 0x22qemu-io drive0 "write -P 0x22 qemu-io drive0 "write -P 0x22 0

qemu-io drive0 "write -P 0x22 0 qemu-io drive0 "write -P 0x22 0 4qemu-io drive0 "write -P 0x22 0 4kqemu-io drive0 "write -P 0x22 0 4k"

+(qemu) qemu-io drive0 "write -P 0x22 0 4k"

wrote 4096/4096 bytes at offset 0

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

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=TEST_DIR/t.qcow2,snapshot=on,if=none,id=drive0

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io drqemu-io driqemu-io drivqemu-io driveqemu-io drive0qemu-io drive0 qemu-io drive0 "qemu-io drive0 "wqemu-io drive0 "wrqemu-io drive0 "wriqemu-io drive0 "writqemu-io drive0 "writeqem

u-io drive0 "write qemu-io drive0 "write -qemu-io drive0 "write -Pqemu-io drive0 "write -P qemu-io drive0 "write -P 0qemu-io drive0 "write -P 0xqemu-io drive0 "write -P 0x2qemu-io drive0 "write -P 0x22qemu-io drive0 "write -P 0x22 qemu-io drive0 "write -P 0x22 0

qemu-io drive0 "write -P 0x22 0 qemu-io drive0 "write -P 0x22 0 4qemu-io drive0 "write -P 0x22 0 4kqemu-io drive0 "write -P 0x22 0 4k"

+(qemu) qemu-io drive0 "write -P 0x22 0 4k"

wrote 4096/4096 bytes at offset 0

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

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file.filename=TEST_DIR/t.qcow2,driver=qcow2,snapshot=on,if=none,id=drive0

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io drqemu-io driqemu-io drivqemu-io driveqemu-io drive0qemu-io drive0 qemu-io drive0 "qemu-io drive0 "wqemu-io drive0 "wrqemu-io drive0 "wriqemu-io drive0 "writqemu-io drive0 "writeqem

u-io drive0 "write qemu-io drive0 "write -qemu-io drive0 "write -Pqemu-io drive0 "write -P qemu-io drive0 "write -P 0qemu-io drive0 "write -P 0xqemu-io drive0 "write -P 0x2qemu-io drive0 "write -P 0x22qemu-io drive0 "write -P 0x22 qemu-io drive0 "write -P 0x22 0

qemu-io drive0 "write -P 0x22 0 qemu-io drive0 "write -P 0x22 0 4qemu-io drive0 "write -P 0x22 0 4kqemu-io drive0 "write -P 0x22 0 4k"

+(qemu) qemu-io drive0 "write -P 0x22 0 4k"

wrote 4096/4096 bytes at offset 0

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

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file.filename=TEST_DIR/t.qcow2,driver=qcow2,if=none,id=drive0 -snapshot

QEMU X.Y.Z monitor - type 'help' for more information

-(qemu) qqeqemqemuqemu-qemu-iqemu-ioqemu-io qemu-io dqemu-io drqemu-io driqemu-io drivqemu-io driveqemu-io drive0qemu-io drive0 qemu-io drive0 "qemu-io drive0 "wqemu-io drive0 "wrqemu-io drive0 "wriqemu-io drive0 "writqemu-io drive0 "writeqem

u-io drive0 "write qemu-io drive0 "write -qemu-io drive0 "write -Pqemu-io drive0 "write -P qemu-io drive0 "write -P 0qemu-io drive0 "write -P 0xqemu-io drive0 "write -P 0x2qemu-io drive0 "write -P 0x22qemu-io drive0 "write -P 0x22 qemu-io drive0 "write -P 0x22 0

qemu-io drive0 "write -P 0x22 0 qemu-io drive0 "write -P 0x22 0 4qemu-io drive0 "write -P 0x22 0 4kqemu-io drive0 "write -P 0x22 0 4k"

+(qemu) qemu-io drive0 "write -P 0x22 0 4k"

wrote 4096/4096 bytes at offset 0

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

-(qemu) qququiquit

+(qemu) quit

Testing: -drive file=file:TEST_DIR/t.qcow2,if=none,id=drive0 -snapshot

QEMU X.Y.Z monitor - type 'help' for more information