The following changes since commit 9f55925b8f50a962d1d08d815044db7767ae3838:

Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-3.0-pull-request' into staging (2018-06-11 12:46:16 +0100)

git://github.com/XanClic/qemu.git tags/pull-block-2018-06-11

for you to fetch changes up to c50abd175a88cd41c2c08339de91f6f6e4a7b162:

iotests: Add case for a corrupted inactive image (2018-06-11 16:18:45 +0200)

- Various bug fixes

- Removal of qemu-img convert's deprecated -s option

- qemu-io now exits with an error when a command failed

Alberto Garcia (1):

throttle: Fix crash on reopen

Max Reitz (25):

block/file-posix: Pass FD to locking helpers

block/file-posix: File locking during creation

iotests: Add creation test to 153

qemu-img: Amendment support implies create_opts

block: Add Error parameter to bdrv_amend_options

qemu-option: Pull out "Supported options" print

qemu-img: Add print_amend_option_help()

qemu-img: Recognize no creation support in -o help

iotests: Test help option for unsupporting formats

iotests: Rework 113

qcow2: Repair OFLAG_COPIED when fixing leaks

iotests: Repairing error during snapshot deletion

qemu-io: Drop command functions' return values

qemu-io: Let command functions return error code

qemu-io: Exit with error when a command failed

iotests.py: Add qemu_io_silent

iotests: Let 216 make use of qemu-io's exit code

qemu-img: Resolve relative backing paths in rebase

iotests: Add test for rebasing with relative paths

qemu-img: Special post-backing convert handling

iotests: Test post-backing convert target behavior

iotests: Fix 219's timing

block: Make bdrv_is_writable() public

qcow2: Do not mark inactive images corrupt

iotests: Add case for a corrupted inactive image

Thomas Huth (1):

qemu-img: Remove deprecated -s snapshot_id_or_name option

Vladimir Sementsov-Ogievskiy (2):

iotests: improve pause_job

block/qcow2-bitmap: fix free_bitmap_clusters

include/block/block.h | 4 +-

include/block/block_int.h | 3 +-

include/qemu-io.h | 9 +-

block.c | 25 ++-

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

block/qcow2-bitmap.c | 1 -

block/qcow2-refcount.c | 25 ++-

block/qcow2.c | 74 +++++----

block/throttle.c | 54 ++++---

qemu-img.c | 108 +++++++++++--

qemu-io-cmds.c | 276 +++++++++++++++++++---------------

qemu-io.c | 62 +++++---

util/qemu-option.c | 1 -

qemu-doc.texi | 7 -

qemu-img-cmds.hx | 4 +-

qemu-img.texi | 7 +-

tests/qemu-iotests/024 | 82 +++++++++-

tests/qemu-iotests/024.out | 30 ++++

tests/qemu-iotests/029 | 2 +-

tests/qemu-iotests/060 | 30 ++++

tests/qemu-iotests/060.out | 18 ++-

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

tests/qemu-iotests/080 | 4 +-

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

tests/qemu-iotests/082 | 9 ++

tests/qemu-iotests/082.out | 53 ++++---

tests/qemu-iotests/112.out | 5 +-

tests/qemu-iotests/113 | 19 ++-

tests/qemu-iotests/113.out | 7 +-

tests/qemu-iotests/122 | 42 ++++++

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

tests/qemu-iotests/153 | 18 +++

tests/qemu-iotests/153.out | 13 ++

tests/qemu-iotests/216 | 23 +--

tests/qemu-iotests/216.out | 17 +--

tests/qemu-iotests/217 | 90 +++++++++++

tests/qemu-iotests/217.out | 42 ++++++

tests/qemu-iotests/219 | 26 +++-

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

tests/qemu-iotests/group | 1 +

tests/qemu-iotests/iotests.py | 18 ++-

41 files changed, 970 insertions(+), 342 deletions(-)

create mode 100755 tests/qemu-iotests/217

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

2.17.1

Reviewed-by: John Snow <jsnow@redhat.com>

Tested-by: Jeff Cody <jcody@redhat.com>

Reviewed-by: Jeff Cody <jcody@redhat.com>

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

Message-id: 20180606193702.7113-4-mreitz@redhat.com

tests/qemu-iotests/060 | 30 ++++++++++++++++++++++++++++++

tests/qemu-iotests/060.out | 14 ++++++++++++++

2 files changed, 44 insertions(+)

diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/060

+++ b/tests/qemu-iotests/060

@@ -XXX,XX +XXX,XX @@ echo "{'execute': 'qmp_capabilities'}

-drive if=none,node-name=drive,file="$TEST_IMG",driver=qcow2 \

| _filter_qmp | _filter_qemu_io

+echo

+echo "=== Testing incoming inactive corrupted image ==="

+echo

+_make_test_img 64M

+# Create an unaligned L1 entry, so qemu will signal a corruption when

+# reading from the covered area

+poke_file "$TEST_IMG" "$l1_offset" "\x00\x00\x00\x00\x2a\x2a\x2a\x2a"

+# Inactive images are effectively read-only images, so this should be a

+# non-fatal corruption (which does not modify the image)

+echo "{'execute': 'qmp_capabilities'}

+ {'execute': 'human-monitor-command',

+ 'arguments': {'command-line': 'qemu-io drive \"read 0 512\"'}}

+ {'execute': 'quit'}" \

+ | $QEMU -qmp stdio -nographic -nodefaults \

+ -blockdev "{'node-name': 'drive',

+ 'driver': 'qcow2',

+ 'file': {

+ 'driver': 'file',

+ 'filename': '$TEST_IMG'

+ }}" \

+ -incoming exec:'cat /dev/null' \

+ 2>&1 \

+ | _filter_qmp | _filter_qemu_io

+echo

+# Image should not have been marked corrupt

+_img_info --format-specific | grep 'corrupt:'

+

# success, all done

echo "*** done"

rm -f $seq.full

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

index XXXXXXX..XXXXXXX 100644

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

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

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

{"return": ""}

{"return": {}}

{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+

+=== Testing incoming inactive corrupted image ===

+

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

+QMP_VERSION

+{"return": {}}

+qcow2: Image is corrupt: L2 table offset 0x2a2a2a00 unaligned (L1 index: 0); further non-fatal corruption events will be suppressed

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_IMAGE_CORRUPTED", "data": {"device": "", "msg": "L2 table offset 0x2a2a2a00 unaligned (L1 index: 0)", "node-name": "drive", "fatal": false}}

+read failed: Input/output error

+{"return": ""}

+{"return": {}}

+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}

+

+ corrupt: false

*** done

2.17.1

From: Alberto Garcia <berto@igalia.com>

The throttle block filter can be reopened, and with this it is

possible to change the throttle group that the filter belongs to.

The way the code does that is the following:

- On throttle_reopen_prepare(): create a new ThrottleGroupMember

and attach it to the new throttle group.

- On throttle_reopen_commit(): detach the old ThrottleGroupMember,

delete it and replace it with the new one.

The problem with this is that by replacing the ThrottleGroupMember the

previous value of io_limits_disabled is lost, causing an assertion

failure in throttle_co_drain_end().

This problem can be reproduced by reopening a throttle node:

$QEMU -monitor stdio

-object throttle-group,id=tg0,x-iops-total=1000 \

-blockdev node-name=hd0,driver=qcow2,file.driver=file,file.filename=hd.qcow2 \

-blockdev node-name=root,driver=throttle,throttle-group=tg0,file=hd0,read-only=on

(qemu) block_stream root

block/throttle.c:214: throttle_co_drain_end: Assertion `tgm->io_limits_disabled' failed.

Since we only want to change the throttle group on reopen there's no

need to create a ThrottleGroupMember and discard the old one. It's

easier if we simply detach it from its current group and attach it to

the new one.

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

Message-id: 20180608151536.7378-1-berto@igalia.com

block/throttle.c | 54 +++++++++++++++++++++++++++++-------------------

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

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

--- a/block/throttle.c

+++ b/block/throttle.c

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

},

};

-static int throttle_configure_tgm(BlockDriverState *bs,

- ThrottleGroupMember *tgm,

- QDict *options, Error **errp)

+/*

+ * If this function succeeds then the throttle group name is stored in

+ * @group and must be freed by the caller.

+ * If there's an error then @group remains unmodified.

+ */

+static int throttle_parse_options(QDict *options, char **group, Error **errp)

{

int ret;

const char *group_name;

@@ -XXX,XX +XXX,XX @@ static int throttle_configure_tgm(BlockDriverState *bs,

goto fin;

}

- /* Register membership to group with name group_name */

- throttle_group_register_tgm(tgm, group_name, bdrv_get_aio_context(bs));

+ *group = g_strdup(group_name);

ret = 0;

fin:

qemu_opts_del(opts);

@@ -XXX,XX +XXX,XX @@ static int throttle_open(BlockDriverState *bs, QDict *options,

int flags, Error **errp)

{

ThrottleGroupMember *tgm = bs->opaque;

+ char *group;

+ int ret;

bs->file = bdrv_open_child(NULL, options, "file", bs,

&child_file, false, errp);

@@ -XXX,XX +XXX,XX @@ static int throttle_open(BlockDriverState *bs, QDict *options,

bs->supported_zero_flags = bs->file->bs->supported_zero_flags |

BDRV_REQ_WRITE_UNCHANGED;

- return throttle_configure_tgm(bs, tgm, options, errp);

+ ret = throttle_parse_options(options, &group, errp);

+ if (ret == 0) {

+ /* Register membership to group with name group_name */

+ throttle_group_register_tgm(tgm, group, bdrv_get_aio_context(bs));

+ g_free(group);

+ }

+

+ return ret;

}

static void throttle_close(BlockDriverState *bs)

@@ -XXX,XX +XXX,XX @@ static void throttle_attach_aio_context(BlockDriverState *bs,

static int throttle_reopen_prepare(BDRVReopenState *reopen_state,

BlockReopenQueue *queue, Error **errp)

{

- ThrottleGroupMember *tgm;

+ int ret;

+ char *group = NULL;

assert(reopen_state != NULL);

assert(reopen_state->bs != NULL);

- reopen_state->opaque = g_new0(ThrottleGroupMember, 1);

- tgm = reopen_state->opaque;

-

- return throttle_configure_tgm(reopen_state->bs, tgm, reopen_state->options,

- errp);

+ ret = throttle_parse_options(reopen_state->options, &group, errp);

+ reopen_state->opaque = group;

+ return ret;

}

static void throttle_reopen_commit(BDRVReopenState *reopen_state)

{

- ThrottleGroupMember *old_tgm = reopen_state->bs->opaque;

- ThrottleGroupMember *new_tgm = reopen_state->opaque;

+ BlockDriverState *bs = reopen_state->bs;

+ ThrottleGroupMember *tgm = bs->opaque;

+ char *group = reopen_state->opaque;

+

+ assert(group);

- throttle_group_unregister_tgm(old_tgm);

- g_free(old_tgm);

- reopen_state->bs->opaque = new_tgm;

+ if (strcmp(group, throttle_group_get_name(tgm))) {

+ throttle_group_unregister_tgm(tgm);

+ throttle_group_register_tgm(tgm, group, bdrv_get_aio_context(bs));

+ }

+ g_free(reopen_state->opaque);

reopen_state->opaque = NULL;

}

static void throttle_reopen_abort(BDRVReopenState *reopen_state)

{

- ThrottleGroupMember *tgm = reopen_state->opaque;

-

- throttle_group_unregister_tgm(tgm);

- g_free(tgm);

+ g_free(reopen_state->opaque);

reopen_state->opaque = NULL;

}

2.17.1

219 has two issues that may lead to sporadic failure, both of which are

the result of issuing query-jobs too early after a job has been

modified. This can then lead to different results based on whether the

modification has taken effect already or not.

First, query-jobs is issued right after the job has been created.

Besides its current progress possibly being in any random state (which

has already been taken care of), its total progress too is basically

arbitrary, because the job may not yet have been able to determine it.

This patch addresses this by just filtering the total progress, like

what has been done for the current progress already. However, for more

clarity, the filtering is changed to replace the values by a string

'FILTERED' instead of deleting them.

Secondly, query-jobs is issued right after a job has been resumed. The

job may or may not yet have had the time to actually perform any I/O,

and thus its current progress may or may not have advanced. To make

sure it has indeed advanced (which is what the reference output already

assumes), keep querying it until it has.

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

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

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

tests/qemu-iotests/219 | 26 ++++++++++++++++++++------

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

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

diff --git a/tests/qemu-iotests/219 b/tests/qemu-iotests/219

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/219

+++ b/tests/qemu-iotests/219

@@ -XXX,XX +XXX,XX @@ def test_pause_resume(vm):

iotests.log(vm.qmp(pause_cmd, **{pause_arg: 'job0'}))

pause_wait(vm, 'job0')

iotests.log(iotests.filter_qmp_event(vm.event_wait('JOB_STATUS_CHANGE')))

- iotests.log(vm.qmp('query-jobs'))

+ result = vm.qmp('query-jobs')

+ iotests.log(result)

+

+ old_progress = result['return'][0]['current-progress']

+ total_progress = result['return'][0]['total-progress']

iotests.log(vm.qmp(resume_cmd, **{resume_arg: 'job0'}))

iotests.log(iotests.filter_qmp_event(vm.event_wait('JOB_STATUS_CHANGE')))

- iotests.log(vm.qmp('query-jobs'))

+ if old_progress < total_progress:

+ # Wait for the job to advance

+ while result['return'][0]['current-progress'] == old_progress:

+ result = vm.qmp('query-jobs')

+ iotests.log(result)

+ else:

+ # Already reached the end, so the job cannot advance

+ # any further; therefore, the query-jobs result can be

+ # logged immediately

+ iotests.log(vm.qmp('query-jobs'))

def test_job_lifecycle(vm, job, job_args, has_ready=False):

iotests.log('')

@@ -XXX,XX +XXX,XX @@ def test_job_lifecycle(vm, job, job_args, has_ready=False):

iotests.log(vm.qmp(job, job_id='job0', **job_args))

# Depending on the storage, the first request may or may not have completed

- # yet, so filter out the progress. Later query-job calls don't need the

- # filtering because the progress is made deterministic by the block job

- # speed

+ # yet (and the total progress may not have been fully determined yet), so

+ # filter out the progress. Later query-job calls don't need the filtering

+ # because the progress is made deterministic by the block job speed

result = vm.qmp('query-jobs')

for j in result['return']:

- del j['current-progress']

+ j['current-progress'] = 'FILTERED'

+ j['total-progress'] = 'FILTERED'

iotests.log(result)

# undefined -> created -> running

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

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

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

@@ -XXX,XX +XXX,XX @@ Launching VM...

Starting block job: drive-mirror (auto-finalize: True; auto-dismiss: True)

{u'return': {}}

-{u'return': [{u'status': u'running', u'total-progress': 4194304, u'id': u'job0', u'type': u'mirror'}]}

+{u'return': [{u'status': u'running', u'current-progress': 'FILTERED', u'total-progress': 'FILTERED', u'id': u'job0', u'type': u'mirror'}]}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'created', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'running', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

@@ -XXX,XX +XXX,XX @@ Waiting for PENDING state...

Starting block job: drive-backup (auto-finalize: True; auto-dismiss: True)

{u'return': {}}

-{u'return': [{u'status': u'running', u'total-progress': 4194304, u'id': u'job0', u'type': u'backup'}]}

+{u'return': [{u'status': u'running', u'current-progress': 'FILTERED', u'total-progress': 'FILTERED', u'id': u'job0', u'type': u'backup'}]}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'created', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'running', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

@@ -XXX,XX +XXX,XX @@ Waiting for PENDING state...

Starting block job: drive-backup (auto-finalize: True; auto-dismiss: False)

{u'return': {}}

-{u'return': [{u'status': u'running', u'total-progress': 4194304, u'id': u'job0', u'type': u'backup'}]}

+{u'return': [{u'status': u'running', u'current-progress': 'FILTERED', u'total-progress': 'FILTERED', u'id': u'job0', u'type': u'backup'}]}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'created', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'running', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

@@ -XXX,XX +XXX,XX @@ Waiting for PENDING state...

Starting block job: drive-backup (auto-finalize: False; auto-dismiss: True)

{u'return': {}}

-{u'return': [{u'status': u'running', u'total-progress': 4194304, u'id': u'job0', u'type': u'backup'}]}

+{u'return': [{u'status': u'running', u'current-progress': 'FILTERED', u'total-progress': 'FILTERED', u'id': u'job0', u'type': u'backup'}]}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'created', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'running', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

@@ -XXX,XX +XXX,XX @@ Waiting for PENDING state...

Starting block job: drive-backup (auto-finalize: False; auto-dismiss: False)

{u'return': {}}

-{u'return': [{u'status': u'running', u'total-progress': 4194304, u'id': u'job0', u'type': u'backup'}]}

+{u'return': [{u'status': u'running', u'current-progress': 'FILTERED', u'total-progress': 'FILTERED', u'id': u'job0', u'type': u'backup'}]}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'created', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'running', u'id': u'job0'}, u'event': u'JOB_STATUS_CHANGE'}

2.17.1

From: Thomas Huth <thuth@redhat.com>

It has been marked as deprecated since QEMU v2.0 already, so it

is time now to finally remove it.

Signed-off-by: Thomas Huth <thuth@redhat.com>

Message-id: 1528288551-31641-1-git-send-email-thuth@redhat.com

Reviewed-by: Jeff Cody <jcody@redhat.com>

qemu-img.c | 7 +------

qemu-doc.texi | 7 -------

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

qemu-img.texi | 7 ++-----

tests/qemu-iotests/029 | 2 +-

tests/qemu-iotests/080 | 4 ++--

6 files changed, 8 insertions(+), 23 deletions(-)

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

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -XXX,XX +XXX,XX @@ static void QEMU_NORETURN help(void)

" 'snapshot_param' is param used for internal snapshot, format\n"

" is 'snapshot.id=[ID],snapshot.name=[NAME]', or\n"

" '[ID_OR_NAME]'\n"

- " 'snapshot_id_or_name' is deprecated, use 'snapshot_param'\n"

- " instead\n"

" '-c' indicates that target image must be compressed (qcow format only)\n"

" '-u' allows unsafe backing chains. For rebasing, it is assumed that old and\n"

" new backing file match exactly. The image doesn't need a working\n"

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

{"target-image-opts", no_argument, 0, OPTION_TARGET_IMAGE_OPTS},

{0, 0, 0, 0}

};

- c = getopt_long(argc, argv, ":hf:O:B:co:s:l:S:pt:T:qnm:WU",

+ c = getopt_long(argc, argv, ":hf:O:B:co:l:S:pt:T:qnm:WU",

long_options, NULL);

if (c == -1) {

break;

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

g_free(old_options);

}

break;

- case 's':

- snapshot_name = optarg;

- break;

case 'l':

if (strstart(optarg, SNAPSHOT_OPT_BASE, NULL)) {

sn_opts = qemu_opts_parse_noisily(&internal_snapshot_opts,

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

index XXXXXXX..XXXXXXX 100644

--- a/qemu-doc.texi

+++ b/qemu-doc.texi

@@ -XXX,XX +XXX,XX @@ Option @option{-virtioconsole} has been replaced by

The @code{-clock} option is ignored since QEMU version 1.7.0. There is no

replacement since it is not needed anymore.

-@section qemu-img command line arguments

-

-@subsection convert -s (since 2.0.0)

-

-The ``convert -s snapshot_id_or_name'' argument is obsoleted

-by the ``convert -l snapshot_param'' argument instead.

-

@section QEMU Machine Protocol (QMP) commands

@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)

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

index XXXXXXX..XXXXXXX 100644

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

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

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

ETEXI

DEF("convert", img_convert,

- "convert [--object objectdef] [--image-opts] [--target-image-opts] [-U] [-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")

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

STEXI

-@item convert [--object @var{objectdef}] [--image-opts] [--target-image-opts] [-U] [-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}

+@item convert [--object @var{objectdef}] [--image-opts] [--target-image-opts] [-U] [-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}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @var{filename} [@var{filename2} [...]] @var{output_filename}

ETEXI

DEF("create", img_create,

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 @@ by the used format or see the format descriptions below for details.

is param used for internal snapshot, format is

'snapshot.id=[ID],snapshot.name=[NAME]' or '[ID_OR_NAME]'

-@item snapshot_id_or_name

-is deprecated, use snapshot_param instead

-

@end table

@table @option

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

@end table

-@item convert [--object @var{objectdef}] [--image-opts] [--target-image-opts] [-U] [-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}

+@item convert [--object @var{objectdef}] [--image-opts] [--target-image-opts] [-U] [-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}] [-l @var{snapshot_param}] [-S @var{sparse_size}] [-m @var{num_coroutines}] [-W] @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)

+Convert the disk image @var{filename} or a snapshot @var{snapshot_param}

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

option) or use any format specific options like encryption (@code{-o} option).

diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/029

+++ b/tests/qemu-iotests/029

@@ -XXX,XX +XXX,XX @@ _make_test_img 64M

{ $QEMU_IMG snapshot -c foo $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir

poke_file "$TEST_IMG" "$offset_size" "\x00\x00\x00\x00\x00\x00\x02\x00"

poke_file "$TEST_IMG" "$offset_l1_size" "\x00\x00\x00\x01"

-{ $QEMU_IMG convert -s foo $TEST_IMG $TEST_IMG.snap; } 2>&1 | _filter_qemu_io | _filter_testdir

+{ $QEMU_IMG convert -l foo $TEST_IMG $TEST_IMG.snap; } 2>&1 | _filter_qemu_io | _filter_testdir

# success, all done

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/080

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

@@ -XXX,XX +XXX,XX @@ _make_test_img 64M

{ $QEMU_IO -c "write 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir

{ $QEMU_IMG snapshot -c test $TEST_IMG; } 2>&1 | _filter_testdir

poke_file "$TEST_IMG" "$offset_snap1_l1_offset" "\x00\x00\x00\x00\x00\x40\x02\x00"

-{ $QEMU_IMG convert -s test $TEST_IMG $TEST_IMG.snap; } 2>&1 | _filter_testdir

+{ $QEMU_IMG convert -l test $TEST_IMG $TEST_IMG.snap; } 2>&1 | _filter_testdir

{ $QEMU_IMG amend -o compat=0.10 $TEST_IMG; } 2>&1 | _filter_testdir

{ $QEMU_IO -c "open -o overlap-check.inactive-l2=on $TEST_IMG" \

-c 'write 0 4k'; } 2>&1 | _filter_qemu_io | _filter_testdir

@@ -XXX,XX +XXX,XX @@ _make_test_img 64M

{ $QEMU_IO -c "write 0 512" $TEST_IMG; } 2>&1 | _filter_qemu_io | _filter_testdir

{ $QEMU_IMG snapshot -c test $TEST_IMG; } 2>&1 | _filter_testdir

poke_file "$TEST_IMG" "$offset_snap1_l1_size" "\x10\x00\x00\x00"

-{ $QEMU_IMG convert -s test $TEST_IMG $TEST_IMG.snap; } 2>&1 | _filter_testdir

+{ $QEMU_IMG convert -l test $TEST_IMG $TEST_IMG.snap; } 2>&1 | _filter_testdir

{ $QEMU_IMG amend -o compat=0.10 $TEST_IMG; } 2>&1 | _filter_testdir

{ $QEMU_IO -c "open -o overlap-check.inactive-l2=on $TEST_IMG" \

-c 'write 0 4k'; } 2>&1 | _filter_qemu_io | _filter_testdir

2.17.1

This adds a test for an I/O error during snapshot deletion, and maybe

more importantly, for how to repair the resulting image. If the

snapshot has been deleted before the error occurs, the only negative

result will be leaked clusters -- and those should be repairable with

qemu-img check -r leaks.

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

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

Message-id: 20180509200059.31125-3-mreitz@redhat.com

tests/qemu-iotests/217 | 90 ++++++++++++++++++++++++++++++++++++++

tests/qemu-iotests/217.out | 42 ++++++++++++++++++

tests/qemu-iotests/group | 1 +

3 files changed, 133 insertions(+)

create mode 100755 tests/qemu-iotests/217

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

diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217

new file mode 100755

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/tests/qemu-iotests/217

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

+#!/bin/bash

+#

+# I/O errors when working with internal qcow2 snapshots, and repairing

+# the result

+#

+# Copyright (C) 2018 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/>.

+

+seq=$(basename $0)

+echo "QA output created by $seq"

+

+status=1    # failure is the default!

+

+_cleanup()

+{

+ _cleanup_test_img

+ rm -f "$TEST_DIR/blkdebug.conf"

+}

+trap "_cleanup; exit \$status" 0 1 2 3 15

+

+# get standard environment, filters and checks

+. ./common.rc

+. ./common.filter

+

+# This test is specific to qcow2

+_supported_fmt qcow2

+_supported_proto file

+_supported_os Linux

+

+# This test needs clusters with at least a refcount of 2 so that

+# OFLAG_COPIED is not set. refcount_bits=1 is therefore unsupported.

+_unsupported_imgopts 'refcount_bits=1[^0-9]'

+

+echo

+echo '=== Simulating an I/O error during snapshot deletion ==='

+echo

+

+_make_test_img 64M

+$QEMU_IO -c 'write 0 64k' "$TEST_IMG" | _filter_qemu_io

+

+# Create the snapshot

+$QEMU_IMG snapshot -c foo "$TEST_IMG"

+

+# Verify the snapshot is there

+echo

+_img_info | grep 'Snapshot list'

+echo '(Snapshot filtered)'

+echo

+

+# Try to delete the snapshot (with an error happening when freeing the

+# then leaked clusters)

+cat > "$TEST_DIR/blkdebug.conf" <<EOF

+[inject-error]

+event = "cluster_free"

+errno = "5"

+EOF

+$QEMU_IMG snapshot -d foo "blkdebug:$TEST_DIR/blkdebug.conf:$TEST_IMG"

+

+# Verify the snapshot is gone

+echo

+_img_info | grep 'Snapshot list'

+

+# Should only show leaks

+echo '--- Checking test image ---'

+_check_test_img

+

+echo

+

+# As there are only leaks, this should be able to fully repair the

+# image

+echo '--- Repairing test image ---'

+_check_test_img -r leaks

+

+

+# success, all done

+echo '*** done'

+rm -f $seq.full

+status=0

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

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

+QA output created by 217

+=== Simulating an I/O error during snapshot deletion ===

+

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

+wrote 65536/65536 bytes at offset 0

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

+

+Snapshot list:

+(Snapshot filtered)

+

+qcow2_free_clusters failed: Input/output error

+qemu-img: Could not delete snapshot 'foo': Failed to free the cluster and L1 table: Input/output error

+

+--- Checking test image ---

+Leaked cluster 4 refcount=2 reference=1

+Leaked cluster 5 refcount=2 reference=1

+Leaked cluster 6 refcount=1 reference=0

+Leaked cluster 7 refcount=1 reference=0

+

+4 leaked clusters were found on the image.

+This means waste of disk space, but no harm to data.

+

+--- Repairing test image ---

+Leaked cluster 4 refcount=2 reference=1

+Leaked cluster 5 refcount=2 reference=1

+Leaked cluster 6 refcount=1 reference=0

+Leaked cluster 7 refcount=1 reference=0

+Repairing cluster 4 refcount=2 reference=1

+Repairing cluster 5 refcount=2 reference=1

+Repairing cluster 6 refcount=1 reference=0

+Repairing cluster 7 refcount=1 reference=0

+Repairing OFLAG_COPIED L2 cluster: l1_index=0 l1_entry=40000 refcount=1

+Repairing OFLAG_COPIED data cluster: l2_entry=50000 refcount=1

+The following inconsistencies were found and repaired:

+

+ 4 leaked clusters

+ 2 corruptions

+

+Double checking the fixed image now...

+No errors were found on the image.

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

214 rw auto

215 rw auto quick

216 rw auto quick

+217 rw auto quick

218 rw auto quick

219 rw auto

2.17.1

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

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

Message-id: 20180509182002.8044-3-mreitz@redhat.com

tests/qemu-iotests/024 | 82 ++++++++++++++++++++++++++++++++++++--

tests/qemu-iotests/024.out | 30 ++++++++++++++

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

diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/024

+++ b/tests/qemu-iotests/024

@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!

_cleanup()

{

-    _cleanup_test_img

-    rm -f "$TEST_DIR/t.$IMGFMT.base_old"

-    rm -f "$TEST_DIR/t.$IMGFMT.base_new"

+ _cleanup_test_img

+ rm -f "$TEST_DIR/t.$IMGFMT.base_old"

+ rm -f "$TEST_DIR/t.$IMGFMT.base_new"

+

+ rm -f "$TEST_DIR/subdir/t.$IMGFMT"

+ rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"

+ rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"

+ rmdir "$TEST_DIR/subdir" 2> /dev/null

}

trap "_cleanup; exit \$status" 0 1 2 3 15

@@ -XXX,XX +XXX,XX @@ io_pattern readv $((13 * CLUSTER_SIZE)) $CLUSTER_SIZE 0 1 0x00

io_pattern readv $((14 * CLUSTER_SIZE)) $CLUSTER_SIZE 0 1 0x11

io_pattern readv $((15 * CLUSTER_SIZE)) $CLUSTER_SIZE 0 1 0x00

+echo

+echo "=== Test rebase in a subdirectory of the working directory ==="

+echo

+

+# Clean up the old images beforehand so they do not interfere with