The following changes since commit b2f7a038bb4c4fc5ce6b8486e8513dfd97665e2a:

Merge remote-tracking branch 'remotes/rth/tags/pull-softfloat-20181104' into staging (2018-11-05 10:32:49 +0000)

for you to fetch changes up to 1240ac558d348f6c7a5752b1a57c1da58e4efe3e:

include: Add a comment to explain the origin of sizes' lookup table (2018-11-05 15:29:59 +0100)

Block layer patches:

- auto-read-only option to fix commit job when used with -blockdev

- Fix help text related qemu-iotests failure (by improving the help text

and updating the reference output)

- quorum: Add missing checks when adding/removing child nodes

- Don't take address of fields in packed structs

- vvfat: Fix crash when reporting error about too many files in directory

Alberto Garcia (7):

block: replace "discard" literal with BDRV_OPT_DISCARD macro

qcow2: Get the request alignment for encrypted images from QCryptoBlock

quorum: Remove quorum_err()

quorum: Return an error if the blkverify mode has invalid settings

iotest: Test the blkverify mode of the Quorum driver

quorum: Forbid adding children in blkverify mode

iotest: Test x-blockdev-change on a Quorum

Cleber Rosa (1):

iotests: make 083 specific to raw

Daniel P. Berrangé (1):

crypto: initialize sector size even when opening with no IO flag

Kevin Wolf (12):

vpc: Don't leak opts in vpc_open()

block: Update flags in bdrv_set_read_only()

block: Add auto-read-only option

rbd: Close image in qemu_rbd_open() error path

block: Require auto-read-only for existing fallbacks

nbd: Support auto-read-only option

file-posix: Support auto-read-only option

curl: Support auto-read-only option

gluster: Support auto-read-only option

iscsi: Support auto-read-only option

block: Make auto-read-only=on default for -drive

qemu-iotests: Test auto-read-only with -drive and -blockdev

Leonid Bloch (2):

vdi: Use a literal number of bytes for DEFAULT_CLUSTER_SIZE

include: Add a comment to explain the origin of sizes' lookup table

Li Qiang (1):

block: change some function return type to bool

Max Reitz (5):

option: Make option help nicer to read

chardev: Indent list of chardevs

qdev-monitor: Make device options help nicer

object: Make option help nicer to read

fw_cfg: Drop newline in @file description

Peter Maydell (5):

block/qcow2: Don't take address of fields in packed structs

block/qcow: Don't take address of fields in packed structs

block/qcow2-bitmap: Don't take address of fields in packed structs

block/vhdx: Don't take address of fields in packed structs

block/vdi: Don't take address of fields in packed structs

Stefan Weil (1):

qemu-io-cmds: Fix two format strings

Thomas Huth (1):

block/vvfat: Fix crash when reporting error about too many files in directory

qapi/block-core.json | 7 +

block/vhdx.h | 12 +-

include/block/block.h | 5 +-

include/qemu/option.h | 2 +-

include/qemu/units.h | 18 +

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

block.c | 60 ++-

block/block-backend.c | 8 +-

block/bochs.c | 17 +-

block/cloop.c | 16 +-

block/curl.c | 8 +-

block/dmg.c | 16 +-

block/file-posix.c | 19 +-

block/gluster.c | 12 +-

block/iscsi.c | 8 +-

block/nbd-client.c | 10 +-

block/qcow.c | 18 +-

block/qcow2-bitmap.c | 24 +-

block/qcow2.c | 66 +--

block/quorum.c | 45 +-

block/rbd.c | 14 +-

block/vdi.c | 68 +--

block/vhdx-endian.c | 118 ++---

block/vhdx-log.c | 4 +-

block/vhdx.c | 18 +-

block/vpc.c | 2 +

block/vvfat.c | 15 +-

blockdev.c | 3 +-

chardev/char.c | 2 +-

crypto/block-qcow.c | 2 +

qdev-monitor.c | 13 +-

qemu-img.c | 4 +-

qemu-io-cmds.c | 4 +-

util/qemu-option.c | 32 +-

vl.c | 15 +-

tests/qemu-iotests/081 | 116 +++++

tests/qemu-iotests/081.out | 70 +++

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

tests/qemu-iotests/083 | 2 +-

tests/qemu-iotests/232 | 147 +++++++

tests/qemu-iotests/232.out | 59 +++

tests/qemu-iotests/group | 1 +

42 files changed, 1266 insertions(+), 776 deletions(-)

create mode 100755 tests/qemu-iotests/232

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

From: Alberto Garcia <berto@igalia.com>

This is a static function with only one caller, so there's no need to

keep it. Inlining the code in quorum_compare() makes it much simpler.

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

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

block/quorum.c | 24 +++++-------------------

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

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

--- a/block/quorum.c

+++ b/block/quorum.c

@@ -XXX,XX +XXX,XX @@ static bool quorum_iovec_compare(QEMUIOVector *a, QEMUIOVector *b)

return true;

-static void GCC_FMT_ATTR(2, 3) quorum_err(QuorumAIOCB *acb,

- const char *fmt, ...)

- va_list ap;

-

- va_start(ap, fmt);

- fprintf(stderr, "quorum: offset=%" PRIu64 " bytes=%" PRIu64 " ",

- acb->offset, acb->bytes);

- vfprintf(stderr, fmt, ap);

- fprintf(stderr, "\n");

- va_end(ap);

- exit(1);

-static bool quorum_compare(QuorumAIOCB *acb,

- QEMUIOVector *a,

- QEMUIOVector *b)

+static bool quorum_compare(QuorumAIOCB *acb, QEMUIOVector *a, QEMUIOVector *b)

BDRVQuorumState *s = acb->bs->opaque;

ssize_t offset;

@@ -XXX,XX +XXX,XX @@ static bool quorum_compare(QuorumAIOCB *acb,

if (s->is_blkverify) {

offset = qemu_iovec_compare(a, b);

if (offset != -1) {

- quorum_err(acb, "contents mismatch at offset %" PRIu64,

- acb->offset + offset);

+ fprintf(stderr, "quorum: offset=%" PRIu64 " bytes=%" PRIu64

+ " contents mismatch at offset %" PRIu64 "\n",

+ acb->offset, acb->bytes, acb->offset + offset);

+ exit(1);

}

return true;

}

2.19.1

From: Max Reitz <mreitz@redhat.com>

This adds some whitespace into the option help (including indentation)

and puts angle brackets around the type names. Furthermore, the list

name is no longer printed as part of every line, but only once in

advance, and only if the caller did not print a caption already.

This patch also restores the description alignment we had before commit

9cbef9d68ee1d8d0, just at 24 instead of 16 characters like we used to.

This increase is because now we have the type and two spaces of

indentation before the description, and with a usual type name length of

three chracters, this sums up to eight additional characters -- which

means that we now need 24 characters to get the same amount of padding

for most options. Also, 24 is a third of 80, which makes it kind of a

round number in terminal terms.

Finally, this patch amends the reference output of iotest 082 to match

the changes (and thus makes it pass again).

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

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

include/qemu/option.h | 2 +-

qemu-img.c | 4 +-

util/qemu-option.c | 32 +-

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

4 files changed, 507 insertions(+), 487 deletions(-)

diff --git a/include/qemu/option.h b/include/qemu/option.h

--- a/include/qemu/option.h

+++ b/include/qemu/option.h

@@ -XXX,XX +XXX,XX @@ typedef int (*qemu_opts_loopfunc)(void *opaque, QemuOpts *opts, Error **errp);

int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,

void *opaque, Error **errp);

void qemu_opts_print(QemuOpts *opts, const char *sep);

-void qemu_opts_print_help(QemuOptsList *list);

+void qemu_opts_print_help(QemuOptsList *list, bool print_caption);

void qemu_opts_free(QemuOptsList *list);

QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);

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

--- a/qemu-img.c

+++ b/qemu-img.c

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

printf("Supported options:\n");

- qemu_opts_print_help(create_opts);

+ qemu_opts_print_help(create_opts, false);

qemu_opts_free(create_opts);

return 0;

}

@@ -XXX,XX +XXX,XX @@ static int print_amend_option_help(const char *format)

assert(drv->create_opts);

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

- qemu_opts_print_help(drv->create_opts);

+ qemu_opts_print_help(drv->create_opts, false);

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

return 0;

}

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

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

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

@@ -XXX,XX +XXX,XX @@ static const char *opt_type_to_string(enum QemuOptType type)

g_assert_not_reached();

}

-void qemu_opts_print_help(QemuOptsList *list)

+/**

+ * Print the list of options available in the given list. If

+ * @print_caption is true, a caption (including the list name, if it

+ * exists) is printed. The options itself will be indented, so

+ * @print_caption should only be set to false if the caller prints its

+ * own custom caption (so that the indentation makes sense).

+ */

+void qemu_opts_print_help(QemuOptsList *list, bool print_caption)

{

QemuOptDesc *desc;

int i;

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

desc = list->desc;

while (desc && desc->name) {

GString *str = g_string_new(NULL);

- if (list->name) {

- g_string_append_printf(str, "%s.", list->name);

- }

- g_string_append_printf(str, "%s=%s", desc->name,

+ g_string_append_printf(str, " %s=<%s>", desc->name,

opt_type_to_string(desc->type));

if (desc->help) {

+ if (str->len < 24) {

+ g_string_append_printf(str, "%*s", 24 - (int)str->len, "");

+ }

g_string_append_printf(str, " - %s", desc->help);

}

g_ptr_array_add(array, g_string_free(str, false));

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

g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0);

+ if (print_caption && array->len > 0) {

+ if (list->name) {

+ printf("%s options:\n", list->name);

+ } else {

+ printf("Options:\n");

+ }

+ } else if (array->len == 0) {

+ if (list->name) {

+ printf("There are no options for %s.\n", list->name);

+ } else {

+ printf("No options available.\n");

+ }

+ }

for (i = 0; i < array->len; i++) {

printf("%s\n", (char *)array->pdata[i]);

@@ -XXX,XX +XXX,XX @@ QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list, const char *params,

opts = opts_parse(list, params, permit_abbrev, false, &invalidp, &err);

if (err) {

if (invalidp && has_help_option(params)) {

- qemu_opts_print_help(list);

+ qemu_opts_print_help(list, true);

error_free(err);

} else {

error_report_err(err);

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

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

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

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

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

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

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

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

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

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

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

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

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

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

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

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: create -f qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 128M

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: create -f qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 128M

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: create -f qcow2 -u -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 128M

Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 backing_file=TEST_DIR/t.qcow2,,help cluster_size=65536 lazy_refcounts=off refcount_bits=16

@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,

Testing: create -f qcow2 -o help

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

-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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: create -o help

Supported options:

-size Virtual disk size

+ size=<size> - Virtual disk size

Testing: create -f bochs -o help

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

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

Testing: convert -O qcow2 -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -O qcow2 -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -O qcow2 -o cluster_size=4k,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -O qcow2 -o cluster_size=4k,? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -O qcow2 -o help,cluster_size=4k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -O qcow2 -o ?,cluster_size=4k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -O qcow2 -o cluster_size=4k -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -O qcow2 -o cluster_size=4k -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ nocow=<bool (on/off)> - Turn off copy-on-write (valid only on btrfs)

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing file: Could not open 'TEST_DIR/t.qcow2,help': No such file or directory

@@ -XXX,XX +XXX,XX @@ qemu-img: Invalid option list: ,,

Testing: convert -O qcow2 -o help

Supported options:

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

-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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Testing: convert -o help

Supported options:

-size Virtual disk size

+ size=<size> - Virtual disk size

Testing: convert -O bochs -o help

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

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

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

Creation options for 'qcow2':

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

-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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Note that not all of these options may be amendable.

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

Creation options for 'qcow2':

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

-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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase

+ encryption=<bool (on/off)> - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

+ lazy_refcounts=<bool (on/off)> - Postpone refcount updates

+ preallocation=<str> - Preallocation mode (allowed values: off, metadata, falloc, full)

+ refcount_bits=<num> - Width of a reference count entry in bits

+ size=<size> - Virtual disk size

Note that not all of these options may be amendable.

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

Creation options for 'qcow2':

-size Virtual disk size

-compat Compatibility level (0.10 or 1.1)

-backing_file File name of a base image

-backing_fmt Image format of the base image

-encryption Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)

-encrypt.format Encrypt the image, format choices: 'aes', 'luks'

-encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase

-encrypt.cipher-alg Name of encryption cipher algorithm

-encrypt.cipher-mode Name of encryption cipher mode

-encrypt.ivgen-alg Name of IV generator algorithm

-encrypt.ivgen-hash-alg Name of IV generator hash algorithm

-encrypt.hash-alg Name of encryption hash algorithm

-encrypt.iter-time Time to spend in PBKDF in milliseconds

-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

+ backing_file=<str> - File name of a base image

+ backing_fmt=<str> - Image format of the base image

+ cluster_size=<size> - qcow2 cluster size

+ compat=<str> - Compatibility level (0.10 or 1.1)

+ encrypt.cipher-alg=<str> - Name of encryption cipher algorithm

+ encrypt.cipher-mode=<str> - Name of encryption cipher mode

+ encrypt.format=<str> - Encrypt the image, format choices: 'aes', 'luks'

+ encrypt.hash-alg=<str> - Name of encryption hash algorithm

+ encrypt.iter-time=<num> - Time to spend in PBKDF in milliseconds

+ encrypt.ivgen-alg=<str> - Name of IV generator algorithm

+ encrypt.ivgen-hash-alg=<str> - Name of IV generator hash algorithm

+ encrypt.key-secret=<str> - ID of secret providing qcow AES key or LUKS passphrase