raw_apply_lock_bytes() and raw_check_lock_bytes() currently take a

BDRVRawState *, but they only use the lock_fd field. During image

creation, we do not have a BDRVRawState, but we do have an FD; so if we

want to reuse the functions there, we should modify them to receive only

the FD.

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

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

Message-id: 20180509215336.31304-2-mreitz@redhat.com

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

---

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

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

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

index XXXXXXX..XXXXXXX 100644

--- a/block/file-posix.c

+++ b/block/file-posix.c

@@ -XXX,XX +XXX,XX @@ typedef enum {

* file; if @unlock == true, also unlock the unneeded bytes.

* @shared_perm_lock_bits is the mask of all permissions that are NOT shared.

*/

-static int raw_apply_lock_bytes(BDRVRawState *s,

+static int raw_apply_lock_bytes(int fd,

uint64_t perm_lock_bits,

uint64_t shared_perm_lock_bits,

bool unlock, Error **errp)

@@ -XXX,XX +XXX,XX @@ static int raw_apply_lock_bytes(BDRVRawState *s,

PERM_FOREACH(i) {

int off = RAW_LOCK_PERM_BASE + i;

if (perm_lock_bits & (1ULL << i)) {

- ret = qemu_lock_fd(s->lock_fd, off, 1, false);

+ ret = qemu_lock_fd(fd, off, 1, false);

if (ret) {

error_setg(errp, "Failed to lock byte %d", off);

return ret;

}

} else if (unlock) {

- ret = qemu_unlock_fd(s->lock_fd, off, 1);

+ ret = qemu_unlock_fd(fd, off, 1);

if (ret) {

error_setg(errp, "Failed to unlock byte %d", off);

return ret;

@@ -XXX,XX +XXX,XX @@ static int raw_apply_lock_bytes(BDRVRawState *s,

PERM_FOREACH(i) {

int off = RAW_LOCK_SHARED_BASE + i;

if (shared_perm_lock_bits & (1ULL << i)) {

- ret = qemu_lock_fd(s->lock_fd, off, 1, false);

+ ret = qemu_lock_fd(fd, off, 1, false);

if (ret) {

error_setg(errp, "Failed to lock byte %d", off);

return ret;

}

} else if (unlock) {

- ret = qemu_unlock_fd(s->lock_fd, off, 1);

+ ret = qemu_unlock_fd(fd, off, 1);

if (ret) {

error_setg(errp, "Failed to unlock byte %d", off);

return ret;

@@ -XXX,XX +XXX,XX @@ static int raw_apply_lock_bytes(BDRVRawState *s,

}

/* Check "unshared" bytes implied by @perm and ~@shared_perm in the file. */

-static int raw_check_lock_bytes(BDRVRawState *s,

- uint64_t perm, uint64_t shared_perm,

+static int raw_check_lock_bytes(int fd, uint64_t perm, uint64_t shared_perm,

Error **errp)

{

int ret;

@@ -XXX,XX +XXX,XX @@ static int raw_check_lock_bytes(BDRVRawState *s,

int off = RAW_LOCK_SHARED_BASE + i;

uint64_t p = 1ULL << i;

if (perm & p) {

- ret = qemu_lock_fd_test(s->lock_fd, off, 1, true);

+ ret = qemu_lock_fd_test(fd, off, 1, true);

if (ret) {

char *perm_name = bdrv_perm_names(p);

error_setg(errp,

@@ -XXX,XX +XXX,XX @@ static int raw_check_lock_bytes(BDRVRawState *s,

int off = RAW_LOCK_PERM_BASE + i;

uint64_t p = 1ULL << i;

if (!(shared_perm & p)) {

- ret = qemu_lock_fd_test(s->lock_fd, off, 1, true);

+ ret = qemu_lock_fd_test(fd, off, 1, true);

if (ret) {

char *perm_name = bdrv_perm_names(p);

error_setg(errp,

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

switch (op) {

case RAW_PL_PREPARE:

- ret = raw_apply_lock_bytes(s, s->perm | new_perm,

+ ret = raw_apply_lock_bytes(s->lock_fd, s->perm | new_perm,

~s->shared_perm | ~new_shared,

false, errp);

if (!ret) {

- ret = raw_check_lock_bytes(s, new_perm, new_shared, errp);

+ ret = raw_check_lock_bytes(s->lock_fd, new_perm, new_shared, errp);

if (!ret) {

return 0;

}

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

op = RAW_PL_ABORT;

/* fall through to unlock bytes. */

case RAW_PL_ABORT:

- raw_apply_lock_bytes(s, s->perm, ~s->shared_perm, true, &local_err);

+ raw_apply_lock_bytes(s->lock_fd, s->perm, ~s->shared_perm,

+ true, &local_err);

if (local_err) {

/* Theoretically the above call only unlocks bytes and it cannot

* fail. Something weird happened, report it.

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

}

break;

case RAW_PL_COMMIT:

- raw_apply_lock_bytes(s, new_perm, ~new_shared, true, &local_err);

+ raw_apply_lock_bytes(s->lock_fd, new_perm, ~new_shared,

+ true, &local_err);

if (local_err) {

/* Theoretically the above call only unlocks bytes and it cannot

* fail. Something weird happened, report it.

--

2.17.1

When creating a file, we should take the WRITE and RESIZE permissions.

We do not need either for the creation itself, but we do need them for

clearing and resizing it. So we can take the proper permissions by

replacing O_TRUNC with an explicit truncation to 0, and by taking the

appropriate file locks between those two steps.

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

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

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

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

---

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

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

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

index XXXXXXX..XXXXXXX 100644

--- a/block/file-posix.c

+++ b/block/file-posix.c

@@ -XXX,XX +XXX,XX @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)

{

BlockdevCreateOptionsFile *file_opts;

int fd;

+ int perm, shared;

int result = 0;

/* Validate options and set default values */

@@ -XXX,XX +XXX,XX @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)

}

/* Create file */

- fd = qemu_open(file_opts->filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY,

- 0644);

+ fd = qemu_open(file_opts->filename, O_RDWR | O_CREAT | O_BINARY, 0644);

if (fd < 0) {

result = -errno;

error_setg_errno(errp, -result, "Could not create file");

goto out;

}

+ /* Take permissions: We want to discard everything, so we need

+ * BLK_PERM_WRITE; and truncation to the desired size requires

+ * BLK_PERM_RESIZE.

+ * On the other hand, we cannot share the RESIZE permission

+ * because we promise that after this function, the file has the

+ * size given in the options. If someone else were to resize it

+ * concurrently, we could not guarantee that.

+ * Note that after this function, we can no longer guarantee that

+ * the file is not touched by a third party, so it may be resized

+ * then. */

+ perm = BLK_PERM_WRITE | BLK_PERM_RESIZE;

+ shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;

+

+ /* Step one: Take locks */

+ result = raw_apply_lock_bytes(fd, perm, shared, false, errp);

+ if (result < 0) {

+ goto out_close;

+ }

+

+ /* Step two: Check that nobody else has taken conflicting locks */

+ result = raw_check_lock_bytes(fd, perm, shared, errp);

+ if (result < 0) {

+ goto out_close;

+ }

+

+ /* Clear the file by truncating it to 0 */

+ result = raw_regular_truncate(fd, 0, PREALLOC_MODE_OFF, errp);

+ if (result < 0) {

+ goto out_close;

+ }

+

if (file_opts->nocow) {

#ifdef __linux__

/* Set NOCOW flag to solve performance issue on fs like btrfs.

@@ -XXX,XX +XXX,XX @@ static int raw_co_create(BlockdevCreateOptions *options, Error **errp)

#endif

}

+ /* Resize and potentially preallocate the file to the desired

+ * final size */

result = raw_regular_truncate(fd, file_opts->size, file_opts->preallocation,

errp);

if (result < 0) {

--

2.17.1

This patch adds a test case to 153 which tries to overwrite an image

(using qemu-img create) while it is in use. Without the original user

explicitly sharing the necessary permissions (writing and truncation),

this should not be allowed.

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

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

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

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

---

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

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

2 files changed, 31 insertions(+)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/153

+++ b/tests/qemu-iotests/153

@@ -XXX,XX +XXX,XX @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do

_run_cmd $QEMU_IMG dd $L if="${TEST_IMG}" of="${TEST_IMG}.convert" bs=512 count=1

_run_cmd $QEMU_IMG bench $L -c 1 "${TEST_IMG}"

_run_cmd $QEMU_IMG bench $L -w -c 1 "${TEST_IMG}"

+

+ # qemu-img create does not support -U

+ if [ -z "$L" ]; then

+ _run_cmd $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" \

+ -b ${TEST_IMG}.base

+ # Read the file format. It used to be the case that

+ # file-posix simply truncated the file, but the qcow2

+ # driver then failed to format it because it was unable

+ # to acquire the necessary WRITE permission. However, the

+ # truncation was already wrong, and the whole process

+ # resulted in the file being completely empty and thus its

+ # format would be detected to be raw.

+ # So we read it here to see that creation either completed

+ # successfully (thus the format is qcow2) or it aborted

+ # before the file was changed at all (thus the format stays

+ # qcow2).

+ _img_info -U | grep 'file format'

+ fi

done

_send_qemu_cmd $h "{ 'execute': 'quit', }" ""

echo

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2

qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock

Is another process using the image?

+_qemu_img_wrapper create -f qcow2 TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base

+qemu-img: TEST_DIR/t.qcow2: Failed to get "write" lock

+Is another process using the image?

+file format: IMGFMT

+

== Running utility commands -U ==

_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2

@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2

qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock

Is another process using the image?

+_qemu_img_wrapper create -f qcow2 TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base

+qemu-img: TEST_DIR/t.qcow2: Failed to get "write" lock

+Is another process using the image?

+file format: IMGFMT

+

== Running utility commands -U ==

_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2

@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper bench -c 1 TEST_DIR/t.qcow2

_qemu_img_wrapper bench -w -c 1 TEST_DIR/t.qcow2

+_qemu_img_wrapper create -f qcow2 TEST_DIR/t.qcow2 -b TEST_DIR/t.qcow2.base

+file format: IMGFMT

+

== Running utility commands -U ==

_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2

--

2.17.1

Instead of checking whether a driver has a non-NULL create_opts we

should check whether it supports image amendment in the first place. If

it does, it must have create_opts.

On the other hand, if it does not have create_opts (so it does not

support amendment either), the error message "does not support any

options" is a bit useless. Stating clearly that the driver has no

amendment support whatsoever is probably better.

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

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

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

Message-id: 20180509210023.20283-2-mreitz@redhat.com

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

---

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

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

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_amend(int argc, char **argv)

goto out;

}

- if (!bs->drv->create_opts) {

- error_report("Format driver '%s' does not support any options to amend",

+ if (!bs->drv->bdrv_amend_options) {

+ error_report("Format driver '%s' does not support option amendment",

fmt);

ret = -1;

goto out;

}

+ /* Every driver supporting amendment must have create_opts */

+ assert(bs->drv->create_opts);

+

create_opts = qemu_opts_append(create_opts, bs->drv->create_opts);

opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);

qemu_opts_do_parse(opts, options, NULL, &err);

--

2.17.1

Looking at the qcow2 code that is riddled with error_report() calls,

this is really how it should have been from the start.

Along the way, turn the target_version/current_version comparisons at

the beginning of qcow2_downgrade() into assertions (the caller has to

make sure these conditions are met), and rephrase the error message on

using compat=1.1 to get refcount widths other than 16 bits.

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

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

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

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

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

---

include/block/block.h | 3 +-

include/block/block_int.h | 3 +-

block.c | 8 +++--

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

qemu-img.c | 4 +--

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

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

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

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

9 files changed, 58 insertions(+), 52 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block.h

+++ b/include/block/block.h

@@ -XXX,XX +XXX,XX @@ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix);

typedef void BlockDriverAmendStatusCB(BlockDriverState *bs, int64_t offset,

int64_t total_work_size, void *opaque);

int bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts,

- BlockDriverAmendStatusCB *status_cb, void *cb_opaque);

+ BlockDriverAmendStatusCB *status_cb, void *cb_opaque,

+ Error **errp);

/* external snapshots */

bool bdrv_recurse_is_first_non_filter(BlockDriverState *bs,

diff --git a/include/block/block_int.h b/include/block/block_int.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

@@ -XXX,XX +XXX,XX @@ struct BlockDriver {

int (*bdrv_amend_options)(BlockDriverState *bs, QemuOpts *opts,

BlockDriverAmendStatusCB *status_cb,

- void *cb_opaque);

+ void *cb_opaque,

+ Error **errp);

void (*bdrv_debug_event)(BlockDriverState *bs, BlkdebugEvent event);

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

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

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

}

int bdrv_amend_options(BlockDriverState *bs, QemuOpts *opts,

- BlockDriverAmendStatusCB *status_cb, void *cb_opaque)

+ BlockDriverAmendStatusCB *status_cb, void *cb_opaque,

+ Error **errp)

{

if (!bs->drv) {

+ error_setg(errp, "Node is ejected");

return -ENOMEDIUM;

}

if (!bs->drv->bdrv_amend_options) {

+ error_setg(errp, "Block driver '%s' does not support option amendment",

+ bs->drv->format_name);

return -ENOTSUP;

}

- return bs->drv->bdrv_amend_options(bs, opts, status_cb, cb_opaque);

+ return bs->drv->bdrv_amend_options(bs, opts, status_cb, cb_opaque, errp);

}

/* This function will be called by the bdrv_recurse_is_first_non_filter method

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_load_vmstate(BlockDriverState *bs, QEMUIOVector *qiov,

* have to be removed.

*/

static int qcow2_downgrade(BlockDriverState *bs, int target_version,

- BlockDriverAmendStatusCB *status_cb, void *cb_opaque)

+ BlockDriverAmendStatusCB *status_cb, void *cb_opaque,

+ Error **errp)

{

BDRVQcow2State *s = bs->opaque;

int current_version = s->qcow_version;

int ret;

- if (target_version == current_version) {

- return 0;

- } else if (target_version > current_version) {

- return -EINVAL;

- } else if (target_version != 2) {

- return -EINVAL;

- }

+ /* This is qcow2_downgrade(), not qcow2_upgrade() */

+ assert(target_version < current_version);

+

+ /* There are no other versions (now) that you can downgrade to */

+ assert(target_version == 2);

if (s->refcount_order != 4) {

- error_report("compat=0.10 requires refcount_bits=16");

+ error_setg(errp, "compat=0.10 requires refcount_bits=16");

return -ENOTSUP;

}

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

if (s->incompatible_features & QCOW2_INCOMPAT_DIRTY) {

ret = qcow2_mark_clean(bs);

if (ret < 0) {

+ error_setg_errno(errp, -ret, "Failed to make the image clean");

return ret;

}

}

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

* best thing to do anyway */

if (s->incompatible_features) {

+ error_setg(errp, "Cannot downgrade an image with incompatible features "

+ "%#" PRIx64 " set", s->incompatible_features);

return -ENOTSUP;

}

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

ret = qcow2_expand_zero_clusters(bs, status_cb, cb_opaque);

if (ret < 0) {

+ error_setg_errno(errp, -ret, "Failed to turn zero into data clusters");

return ret;

}

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

ret = qcow2_update_header(bs);

if (ret < 0) {

s->qcow_version = current_version;

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

return ret;

}

return 0;

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

static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

BlockDriverAmendStatusCB *status_cb,

- void *cb_opaque)

+ void *cb_opaque,

+ Error **errp)

{

BDRVQcow2State *s = bs->opaque;

int old_version = s->qcow_version, new_version = old_version;

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

bool encrypt;

int encformat;

int refcount_bits = s->refcount_bits;

- Error *local_err = NULL;

int ret;

QemuOptDesc *desc = opts->list->desc;

Qcow2AmendHelperCBInfo helper_cb_info;

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

} else if (!strcmp(compat, "1.1")) {

new_version = 3;

} else {

- error_report("Unknown compatibility level %s", compat);

+ error_setg(errp, "Unknown compatibility level %s", compat);

return -EINVAL;

}

} else if (!strcmp(desc->name, BLOCK_OPT_PREALLOC)) {

- error_report("Cannot change preallocation mode");

+ error_setg(errp, "Cannot change preallocation mode");

return -ENOTSUP;

} else if (!strcmp(desc->name, BLOCK_OPT_SIZE)) {

new_size = qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 0);

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

!!s->crypto);

if (encrypt != !!s->crypto) {

- error_report("Changing the encryption flag is not supported");

+ error_setg(errp,

+ "Changing the encryption flag is not supported");

return -ENOTSUP;

}

} else if (!strcmp(desc->name, BLOCK_OPT_ENCRYPT_FORMAT)) {

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

qemu_opt_get(opts, BLOCK_OPT_ENCRYPT_FORMAT));

if (encformat != s->crypt_method_header) {

- error_report("Changing the encryption format is not supported");

+ error_setg(errp,

+ "Changing the encryption format is not supported");

return -ENOTSUP;

}

} else if (g_str_has_prefix(desc->name, "encrypt.")) {

- error_report("Changing the encryption parameters is not supported");

+ error_setg(errp,

+ "Changing the encryption parameters is not supported");

return -ENOTSUP;

} else if (!strcmp(desc->name, BLOCK_OPT_CLUSTER_SIZE)) {

cluster_size = qemu_opt_get_size(opts, BLOCK_OPT_CLUSTER_SIZE,

cluster_size);

if (cluster_size != s->cluster_size) {

- error_report("Changing the cluster size is not supported");

+ error_setg(errp, "Changing the cluster size is not supported");

return -ENOTSUP;

}

} else if (!strcmp(desc->name, BLOCK_OPT_LAZY_REFCOUNTS)) {

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

if (refcount_bits <= 0 || refcount_bits > 64 ||

!is_power_of_2(refcount_bits))

{

- error_report("Refcount width must be a power of two and may "

- "not exceed 64 bits");

+ error_setg(errp, "Refcount width must be a power of two and "

+ "may not exceed 64 bits");

return -EINVAL;

}

} else {

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

ret = qcow2_update_header(bs);

if (ret < 0) {

s->qcow_version = old_version;

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

return ret;

}

}

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

int refcount_order = ctz32(refcount_bits);

if (new_version < 3 && refcount_bits != 16) {

- error_report("Different refcount widths than 16 bits require "

- "compatibility level 1.1 or above (use compat=1.1 or "

- "greater)");

+ error_setg(errp, "Refcount widths other than 16 bits require "

+ "compatibility level 1.1 or above (use compat=1.1 or "

+ "greater)");

return -EINVAL;

}

helper_cb_info.current_operation = QCOW2_CHANGING_REFCOUNT_ORDER;

ret = qcow2_change_refcount_order(bs, refcount_order,

&qcow2_amend_helper_cb,

- &helper_cb_info, &local_err);

+ &helper_cb_info, errp);

if (ret < 0) {

- error_report_err(local_err);

return ret;

}

}

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

backing_file ?: s->image_backing_file,

backing_format ?: s->image_backing_format);

if (ret < 0) {

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

return ret;

}

}

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

if (s->use_lazy_refcounts != lazy_refcounts) {

if (lazy_refcounts) {

if (new_version < 3) {

- error_report("Lazy refcounts only supported with compatibility "

- "level 1.1 and above (use compat=1.1 or greater)");

+ error_setg(errp, "Lazy refcounts only supported with "

+ "compatibility level 1.1 and above (use compat=1.1 "

+ "or greater)");

return -EINVAL;

}

s->compatible_features |= QCOW2_COMPAT_LAZY_REFCOUNTS;

ret = qcow2_update_header(bs);

if (ret < 0) {

s->compatible_features &= ~QCOW2_COMPAT_LAZY_REFCOUNTS;

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

return ret;

}

s->use_lazy_refcounts = true;

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

/* make image clean first */

ret = qcow2_mark_clean(bs);

if (ret < 0) {

+ error_setg_errno(errp, -ret, "Failed to make the image clean");

return ret;

}

/* now disallow lazy refcounts */

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

ret = qcow2_update_header(bs);

if (ret < 0) {

s->compatible_features |= QCOW2_COMPAT_LAZY_REFCOUNTS;

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

return ret;

}

s->use_lazy_refcounts = false;

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

if (new_size) {

BlockBackend *blk = blk_new(BLK_PERM_RESIZE, BLK_PERM_ALL);

- ret = blk_insert_bs(blk, bs, &local_err);

+ ret = blk_insert_bs(blk, bs, errp);

if (ret < 0) {

- error_report_err(local_err);

blk_unref(blk);

return ret;

}

- ret = blk_truncate(blk, new_size, PREALLOC_MODE_OFF, &local_err);

+ ret = blk_truncate(blk, new_size, PREALLOC_MODE_OFF, errp);

blk_unref(blk);

if (ret < 0) {

- error_report_err(local_err);

return ret;

}

}

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

if (new_version < old_version) {

helper_cb_info.current_operation = QCOW2_DOWNGRADING;

ret = qcow2_downgrade(bs, new_version, &qcow2_amend_helper_cb,

- &helper_cb_info);

+ &helper_cb_info, errp);

if (ret < 0) {

return ret;

}

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_amend(int argc, char **argv)

/* In case the driver does not call amend_status_cb() */

qemu_progress_print(0.f, 0);

- ret = bdrv_amend_options(bs, opts, &amend_status_cb, NULL);

+ ret = bdrv_amend_options(bs, opts, &amend_status_cb, NULL, &err);

qemu_progress_print(100.f, 0);

if (ret < 0) {

- error_report("Error while amending options: %s", strerror(-ret));

+ error_report_err(err);

goto out;

}

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

qcow2: Marking image as corrupt: L2 table offset 0x42a00 unaligned (L1 index: 0); further corruption events will be suppressed

-qemu-img: Error while amending options: Input/output error

+qemu-img: Failed to turn zero into data clusters: Input/output error

=== Testing unaligned L2 entry ===

@@ -XXX,XX +XXX,XX @@ 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)

qcow2: Marking image as corrupt: Cluster allocation offset 0x52a00 unaligned (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed

-qemu-img: Error while amending options: Input/output error

+qemu-img: Failed to turn zero into data clusters: Input/output error

=== Testing unaligned reftable entry ===

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

index XXXXXXX..XXXXXXX 100644

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

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

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

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

qemu-img: Lazy refcounts only supported with compatibility level 1.1 and above (use compat=1.1 or greater)

-qemu-img: Error while amending options: Invalid argument

qemu-img: Lazy refcounts only supported with compatibility level 1.1 and above (use compat=1.1 or greater)

-qemu-img: Error while amending options: Invalid argument

qemu-img: Unknown compatibility level 0.42

-qemu-img: Error while amending options: Invalid argument

qemu-img: Invalid parameter 'foo'

qemu-img: Changing the cluster size is not supported

-qemu-img: Error while amending options: Operation not supported

qemu-img: Changing the encryption flag is not supported

-qemu-img: Error while amending options: Operation not supported

qemu-img: Cannot change preallocation mode

-qemu-img: Error while amending options: Operation not supported

=== Testing correct handling of unset value ===

@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

Should work:

Should not work:

qemu-img: Changing the cluster size is not supported

-qemu-img: Error while amending options: Operation not supported

=== Testing zero expansion on inactive clusters ===

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 @@ wrote 512/512 bytes at offset 0

512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid

qemu-img: Snapshot L1 table offset invalid

-qemu-img: Error while amending options: Invalid argument

+qemu-img: Failed to turn zero into data clusters: Invalid argument

Failed to flush the refcount block cache: Invalid argument

write failed: Invalid argument

qemu-img: Snapshot L1 table offset invalid

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

512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

qemu-img: Failed to load snapshot: Snapshot L1 table too large

qemu-img: Snapshot L1 table too large

-qemu-img: Error while amending options: File too large

+qemu-img: Failed to turn zero into data clusters: File too large

Failed to flush the refcount block cache: File too large

write failed: File too large

qemu-img: Snapshot L1 table too large

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ refcount bits: 64

=== Amend to compat=0.10 ===

qemu-img: compat=0.10 requires refcount_bits=16

-qemu-img: Error while amending options: Operation not supported

refcount bits: 64

No errors were found on the image.

refcount bits: 16

refcount bits: 16

-qemu-img: Different refcount widths than 16 bits require compatibility level 1.1 or above (use compat=1.1 or greater)

-qemu-img: Error while amending options: Invalid argument

+qemu-img: Refcount widths other than 16 bits require compatibility level 1.1 or above (use compat=1.1 or greater)

refcount bits: 16

=== Amend with snapshot ===

@@ -XXX,XX +XXX,XX @@ refcount bits: 16

wrote 16777216/16777216 bytes at offset 0

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

qemu-img: Cannot decrease refcount entry width to 1 bits: Cluster at offset 0x50000 has a refcount of 2

-qemu-img: Error while amending options: Invalid argument

No errors were found on the image.

refcount bits: 16

No errors were found on the image.

--

2.17.1

It really is up to the caller to decide what this list of options means.

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

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

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

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

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

---

qemu-img.c | 1 +

util/qemu-option.c | 1 -

2 files changed, 1 insertion(+), 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 print_block_option_help(const char *filename, const char *fmt)

create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);

}

+ printf("Supported options:\n");

qemu_opts_print_help(create_opts);

qemu_opts_free(create_opts);

return 0;

diff --git a/util/qemu-option.c b/util/qemu-option.c

index XXXXXXX..XXXXXXX 100644

--- a/util/qemu-option.c

+++ b/util/qemu-option.c

@@ -XXX,XX +XXX,XX @@ void qemu_opts_print_help(QemuOptsList *list)

assert(list);

desc = list->desc;

- printf("Supported options:\n");

while (desc && desc->name) {

printf("%-16s %s\n", desc->name,

desc->help ? desc->help : "No description available");

--

2.17.1

The more generic print_block_option_help() function is not really

suitable for qemu-img amend, for a couple of reasons:

(1) We do not need to append the protocol-level options, as amendment

happens only on one node and does not descend downwards to its

children.

(2) print_block_option_help() says those options are "supported". For

option amendment, we do not really know that. So this new function

explicitly says that those options are the creation options, and not

all of them may be supported.

(3) If the driver does not support option amendment, we should not print

anything (except for an error message that amendment is not

supported).

Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1537956

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

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

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

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

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

---

qemu-img.c | 30 ++++++++++++++++++++++++--

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

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

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 void amend_status_cb(BlockDriverState *bs,

qemu_progress_print(100.f * offset / total_work_size, 0);

}

+static int print_amend_option_help(const char *format)

+{

+ BlockDriver *drv;

+

+ /* Find driver and parse its options */

+ drv = bdrv_find_format(format);

+ if (!drv) {

+ error_report("Unknown file format '%s'", format);

+ return 1;

+ }

+

+ if (!drv->bdrv_amend_options) {

+ error_report("Format driver '%s' does not support option amendment",

+ format);

+ return 1;

+ }

+

+ /* Every driver supporting amendment must have create_opts */

+ assert(drv->create_opts);

+

+ printf("Creation options for '%s':\n", format);

+ qemu_opts_print_help(drv->create_opts);

+ printf("\nNote that not all of these options may be amendable.\n");

+ return 0;

+}

+

static int img_amend(int argc, char **argv)

{

Error *err = NULL;

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

if (fmt && has_help_option(options)) {

/* If a format is explicitly specified (and possibly no filename is

* given), print option help here */

- ret = print_block_option_help(filename, fmt);

+ ret = print_amend_option_help(fmt);

goto out;

}

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

if (has_help_option(options)) {

/* If the format was auto-detected, print option help here */

- ret = print_block_option_help(filename, fmt);

+ ret = print_amend_option_help(fmt);

goto out;

}

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ cluster_size: 65536

=== amend: help for -o ===

Testing: amend -f qcow2 -o help TEST_DIR/t.qcow2

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ cluster_size qcow2 cluster size

preallocation Preallocation mode (allowed values: off, metadata, falloc, full)

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

-nocow Turn off copy-on-write (valid only on btrfs)

+

+Note that not all of these options may be amendable.

Testing: amend -f qcow2 -o ? TEST_DIR/t.qcow2

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ cluster_size qcow2 cluster size

preallocation Preallocation mode (allowed values: off, metadata, falloc, full)

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

-nocow Turn off copy-on-write (valid only on btrfs)

+

+Note that not all of these options may be amendable.

Testing: amend -f qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ cluster_size qcow2 cluster size

preallocation Preallocation mode (allowed values: off, metadata, falloc, full)

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

-nocow Turn off copy-on-write (valid only on btrfs)

+

+Note that not all of these options may be amendable.

Testing: amend -f qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ cluster_size qcow2 cluster size

preallocation Preallocation mode (allowed values: off, metadata, falloc, full)

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

-nocow Turn off copy-on-write (valid only on btrfs)

+

+Note that not all of these options may be amendable.

Testing: amend -f qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ cluster_size qcow2 cluster size

preallocation Preallocation mode (allowed values: off, metadata, falloc, full)

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

-nocow Turn off copy-on-write (valid only on btrfs)

+

+Note that not all of these options may be amendable.

Testing: amend -f qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ cluster_size qcow2 cluster size

preallocation Preallocation mode (allowed values: off, metadata, falloc, full)

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

-nocow Turn off copy-on-write (valid only on btrfs)

+

+Note that not all of these options may be amendable.

Testing: amend -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ cluster_size qcow2 cluster size

preallocation Preallocation mode (allowed values: off, metadata, falloc, full)

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

-nocow Turn off copy-on-write (valid only on btrfs)

+

+Note that not all of these options may be amendable.

Testing: amend -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ cluster_size qcow2 cluster size

preallocation Preallocation mode (allowed values: off, metadata, falloc, full)

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

-nocow Turn off copy-on-write (valid only on btrfs)

+

+Note that not all of these options may be amendable.

Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2

@@ -XXX,XX +XXX,XX @@ Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DIR/

qemu-img: Invalid option list: ,,

Testing: amend -f qcow2 -o help

-Supported options:

+Creation options for 'qcow2':

size Virtual disk size

compat Compatibility level (0.10 or 1.1)

backing_file File name of a base image

@@ -XXX,XX +XXX,XX @@ preallocation Preallocation mode (allowed values: off, metadata, falloc, full

lazy_refcounts Postpone refcount updates

refcount_bits Width of a reference count entry in bits

+Note that not all of these options may be amendable.

+

Testing: convert -o help

Supported options:

size Virtual disk size

--

2.17.1

The only users of print_block_option_help() are qemu-img create and

qemu-img convert for the output image, so this function is always used

for image creation (it used to be used for amendment also, but that is

no longer the case).

So if image creation is not supported by either the format or the

protocol, there is no need to print any option description, because the

user cannot create an image like this anyway.

This also fixes an assertion failure:

$ qemu-img create -f bochs -o help

Supported options:

qemu-img: util/qemu-option.c:219:

qemu_opts_print_help: Assertion `list' failed.

[1] 24831 abort (core dumped) qemu-img create -f bochs -o help

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

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

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

Message-id: 20180509210023.20283-6-mreitz@redhat.com

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

---

qemu-img.c | 10 ++++++++++

1 file changed, 10 insertions(+)

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 print_block_option_help(const char *filename, const char *fmt)

return 1;

}

+ if (!drv->create_opts) {

+ error_report("Format driver '%s' does not support image creation", fmt);

+ return 1;

+ }

+

create_opts = qemu_opts_append(create_opts, drv->create_opts);

if (filename) {

proto_drv = bdrv_find_protocol(filename, true, &local_err);

@@ -XXX,XX +XXX,XX @@ static int print_block_option_help(const char *filename, const char *fmt)

qemu_opts_free(create_opts);

return 1;

}

+ if (!proto_drv->create_opts) {

+ error_report("Protocal driver '%s' does not support image creation",

+ proto_drv->format_name);

+ return 1;

+ }

create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);

}

--

2.17.1

This adds test cases to 082 for qemu-img create/convert/amend "-o help"

on formats that do not support creation or amendment, respectively.

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

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

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

Message-id: 20180509210023.20283-7-mreitz@redhat.com

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

---

tests/qemu-iotests/082 | 9 +++++++++

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

2 files changed, 18 insertions(+)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/082

+++ b/tests/qemu-iotests/082

@@ -XXX,XX +XXX,XX @@ run_qemu_img create -f $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST_

run_qemu_img create -f $IMGFMT -o help

run_qemu_img create -o help

+# Try help option for a format that does not support creation

+run_qemu_img create -f bochs -o help

+

echo

echo === convert: Options specified more than once ===

@@ -XXX,XX +XXX,XX @@ run_qemu_img convert -O $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST

run_qemu_img convert -O $IMGFMT -o help

run_qemu_img convert -o help

+# Try help option for a format that does not support creation

+run_qemu_img convert -O bochs -o help

+

echo

echo === amend: Options specified more than once ===

@@ -XXX,XX +XXX,XX @@ run_qemu_img amend -f $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST_I

run_qemu_img amend -f $IMGFMT -o help

run_qemu_img convert -o help

+# Try help option for a format that does not support amendment

+run_qemu_img amend -f bochs -o help

+

# success, all done

echo "*** done"

rm -f $seq.full

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ Testing: create -o help

Supported options:

size Virtual disk size

+Testing: create -f bochs -o help

+qemu-img: Format driver 'bochs' does not support image creation

+

=== convert: Options specified more than once ===

Testing: create -f qcow2 TEST_DIR/t.qcow2 128M

@@ -XXX,XX +XXX,XX @@ Testing: convert -o help

Supported options:

size Virtual disk size

+Testing: convert -O bochs -o help

+qemu-img: Format driver 'bochs' does not support image creation

+

=== amend: Options specified more than once ===

Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2

@@ -XXX,XX +XXX,XX @@ Note that not all of these options may be amendable.

Testing: convert -o help

Supported options:

size Virtual disk size

+

+Testing: amend -f bochs -o help

+qemu-img: Format driver 'bochs' does not support option amendment

*** done

--

2.17.1