diff mbox series

[RFC,v1,1/1] qemu-iotests: Fix output for testcase 082

Message ID 4e79b7522a0da8a5635024a97f3b04cfd64fe900.1539020852.git.alifm@linux.ibm.com (mailing list archive)
State New, archived
Headers show
Series [RFC,v1,1/1] qemu-iotests: Fix output for testcase 082 | expand

Commit Message

Farhan Ali Oct. 8, 2018, 5:54 p.m. UTC
Commit 9cbef9d68ee: qemu-option: improve qemu_opts_print_help() output,
changed some of the output for qemu-img tool but did not
update the corresponding 082 test case file. This broke
qemu-iotests.

Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
---
 tests/qemu-iotests/082.out | 956 ++++++++++++++++++++++-----------------------
 1 file changed, 478 insertions(+), 478 deletions(-)

Comments

Cleber Rosa Oct. 15, 2018, 3:40 p.m. UTC | #1
On 10/8/18 1:54 PM, Farhan Ali wrote:
> Commit 9cbef9d68ee: qemu-option: improve qemu_opts_print_help() output,
> changed some of the output for qemu-img tool but did not
> update the corresponding 082 test case file. This broke
> qemu-iotests.
> 
> Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
> ---
>  tests/qemu-iotests/082.out | 956 ++++++++++++++++++++++-----------------------
>  1 file changed, 478 insertions(+), 478 deletions(-)
> 
> diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
> index 19e9fb1..2672349 100644
> --- a/tests/qemu-iotests/082.out
> +++ b/tests/qemu-iotests/082.out
> @@ -44,171 +44,171 @@ 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
> @@ -227,27 +227,27 @@ 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
> @@ -300,171 +300,171 @@ 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
> @@ -483,27 +483,27 @@ 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
> @@ -564,177 +564,177 @@ 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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.size=size - Virtual disk size
>  
>  Note that not all of these options may be amendable.
>  
>  Testing: amend -f qcow2 -o cluster_size=4k,? 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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.size=size - Virtual disk size
>  
>  Note that not all of these options may be amendable.
>  
>  Testing: amend -f qcow2 -o help,cluster_size=4k 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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.size=size - Virtual disk size
>  
>  Note that not all of these options may be amendable.
>  
>  Testing: amend -f qcow2 -o ?,cluster_size=4k 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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.size=size - Virtual disk size
>  
>  Note that not all of these options may be amendable.
>  
>  Testing: amend -f qcow2 -o cluster_size=4k -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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.size=size - Virtual disk size
>  
>  Note that not all of these options may be amendable.
>  
>  Testing: amend -f qcow2 -o cluster_size=4k -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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.size=size - Virtual disk size
>  
>  Note that not all of these options may be amendable.
>  
> @@ -757,29 +757,29 @@ qemu-img: Invalid option list: ,,
>  
>  Testing: amend -f qcow2 -o help
>  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
> +qcow2-create-opts.backing_file=str - File name of a base image
> +qcow2-create-opts.backing_fmt=str - Image format of the base image
> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
> +qcow2-create-opts.size=size - Virtual disk size
>  
>  Note that not all of these options may be amendable.
>  
>  Testing: convert -o help
>  Supported options:
> -size             Virtual disk size
> +size=size - Virtual disk size
>  
>  Testing: amend -f bochs -o help
>  qemu-img: Format driver 'bochs' does not support option amendment
> 

082 is failing for me on master (046936ed), and this fixes it.

I'm wondering if/why other people are not running into this, as 082 runs
with qcow2 and is included on `make check-block`.

+ Max,

FIY, I ran into this while reviewing/testing your Python 3 series.

Tested-by: Cleber Rosa <crosa@redhat.com>
Max Reitz Oct. 15, 2018, 3:45 p.m. UTC | #2
On 15.10.18 17:40, Cleber Rosa wrote:
> 
> 
> On 10/8/18 1:54 PM, Farhan Ali wrote:
>> Commit 9cbef9d68ee: qemu-option: improve qemu_opts_print_help() output,
>> changed some of the output for qemu-img tool but did not
>> update the corresponding 082 test case file. This broke
>> qemu-iotests.
>>
>> Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
>> ---
>>  tests/qemu-iotests/082.out | 956 ++++++++++++++++++++++-----------------------
>>  1 file changed, 478 insertions(+), 478 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
>> index 19e9fb1..2672349 100644
>> --- a/tests/qemu-iotests/082.out
>> +++ b/tests/qemu-iotests/082.out
>> @@ -44,171 +44,171 @@ 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
>> @@ -227,27 +227,27 @@ 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
>> @@ -300,171 +300,171 @@ 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
>> @@ -483,27 +483,27 @@ 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
>> @@ -564,177 +564,177 @@ 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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.size=size - Virtual disk size
>>  
>>  Note that not all of these options may be amendable.
>>  
>>  Testing: amend -f qcow2 -o cluster_size=4k,? 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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.size=size - Virtual disk size
>>  
>>  Note that not all of these options may be amendable.
>>  
>>  Testing: amend -f qcow2 -o help,cluster_size=4k 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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.size=size - Virtual disk size
>>  
>>  Note that not all of these options may be amendable.
>>  
>>  Testing: amend -f qcow2 -o ?,cluster_size=4k 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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.size=size - Virtual disk size
>>  
>>  Note that not all of these options may be amendable.
>>  
>>  Testing: amend -f qcow2 -o cluster_size=4k -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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.size=size - Virtual disk size
>>  
>>  Note that not all of these options may be amendable.
>>  
>>  Testing: amend -f qcow2 -o cluster_size=4k -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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.size=size - Virtual disk size
>>  
>>  Note that not all of these options may be amendable.
>>  
>> @@ -757,29 +757,29 @@ qemu-img: Invalid option list: ,,
>>  
>>  Testing: amend -f qcow2 -o help
>>  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
>> +qcow2-create-opts.backing_file=str - File name of a base image
>> +qcow2-create-opts.backing_fmt=str - Image format of the base image
>> +qcow2-create-opts.cluster_size=size - qcow2 cluster size
>> +qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
>> +qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
>> +qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
>> +qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
>> +qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
>> +qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
>> +qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
>> +qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
>> +qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
>> +qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
>> +qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
>> +qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
>> +qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
>> +qcow2-create-opts.size=size - Virtual disk size
>>  
>>  Note that not all of these options may be amendable.
>>  
>>  Testing: convert -o help
>>  Supported options:
>> -size             Virtual disk size
>> +size=size - Virtual disk size
>>  
>>  Testing: amend -f bochs -o help
>>  qemu-img: Format driver 'bochs' does not support option amendment
>>
> 
> 082 is failing for me on master (046936ed), and this fixes it.
> 
> I'm wondering if/why other people are not running into this, as 082 runs
> with qcow2 and is included on `make check-block`.
> 
> + Max,
> 
> FIY, I ran into this while reviewing/testing your Python 3 series.
> 
> Tested-by: Cleber Rosa <crosa@redhat.com>

Thanks for CC-ing me, Cleber.

Farhan, I disagree with this fix, as I wrote here:

http://lists.nongnu.org/archive/html/qemu-devel/2018-10/msg01488.html

I don't like the new output, so I think what we should do is change the
code that produces it.  Marc-André seemed to agree, so I just need to
write a patch (which I didn't get to so far).

Max
Farhan Ali Oct. 16, 2018, 1 p.m. UTC | #3
On 10/15/2018 11:45 AM, Max Reitz wrote:
>> 082 is failing for me on master (046936ed), and this fixes it.
>>
>> I'm wondering if/why other people are not running into this, as 082 runs
>> with qcow2 and is included on `make check-block`.
>>
>> + Max,
>>
>> FIY, I ran into this while reviewing/testing your Python 3 series.
>>
>> Tested-by: Cleber Rosa<crosa@redhat.com>
> Thanks for CC-ing me, Cleber.
> 
> Farhan, I disagree with this fix, as I wrote here:
> 
> http://lists.nongnu.org/archive/html/qemu-devel/2018-10/msg01488.html
> 
> I don't like the new output, so I think what we should do is change the
> code that produces it.  Marc-André seemed to agree, so I just need to
> write a patch (which I didn't get to so far).
> 
> Max
> 

Hi Max,

That is fine with me. The reason I sent this patch out as an RFC was 
because I wasn't sure about the fix. So for the time being is it okay 
for the test to fail? And if you do submit a patch, would you kindly cc 
me as well.

Thank you
Farhan
Max Reitz Oct. 19, 2018, 10:02 a.m. UTC | #4
On 16.10.18 15:00, Farhan Ali wrote:
> 
> 
> On 10/15/2018 11:45 AM, Max Reitz wrote:
>>> 082 is failing for me on master (046936ed), and this fixes it.
>>>
>>> I'm wondering if/why other people are not running into this, as 082 runs
>>> with qcow2 and is included on `make check-block`.
>>>
>>> + Max,
>>>
>>> FIY, I ran into this while reviewing/testing your Python 3 series.
>>>
>>> Tested-by: Cleber Rosa<crosa@redhat.com>
>> Thanks for CC-ing me, Cleber.
>>
>> Farhan, I disagree with this fix, as I wrote here:
>>
>> http://lists.nongnu.org/archive/html/qemu-devel/2018-10/msg01488.html
>>
>> I don't like the new output, so I think what we should do is change the
>> code that produces it.  Marc-André seemed to agree, so I just need to
>> write a patch (which I didn't get to so far).
>>
>> Max
>>
> 
> Hi Max,
> 
> That is fine with me. The reason I sent this patch out as an RFC was
> because I wasn't sure about the fix. So for the time being is it okay
> for the test to fail?

I think so, yes.  It looks like we've agreed that we want another change
(although we haven't agreed on the details yet), so I think it's OK to
leave it broken until then.

It's definitely interesting to see how many people run the iotests these
days. :-)  (You're not the only one to send a patch to fix this.)

> And if you do submit a patch, would you kindly cc
> me as well.

I already did:

http://lists.nongnu.org/archive/html/qemu-block/2018-10/msg00465.html

(Though a v2 is in order.)

Max
diff mbox series

Patch

diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
index 19e9fb1..2672349 100644
--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -44,171 +44,171 @@  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
@@ -227,27 +227,27 @@  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
@@ -300,171 +300,171 @@  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
@@ -483,27 +483,27 @@  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
@@ -564,177 +564,177 @@  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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.size=size - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o cluster_size=4k,? 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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.size=size - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o help,cluster_size=4k 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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.size=size - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o ?,cluster_size=4k 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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.size=size - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o cluster_size=4k -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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.size=size - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: amend -f qcow2 -o cluster_size=4k -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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.size=size - Virtual disk size
 
 Note that not all of these options may be amendable.
 
@@ -757,29 +757,29 @@  qemu-img: Invalid option list: ,,
 
 Testing: amend -f qcow2 -o help
 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
+qcow2-create-opts.backing_file=str - File name of a base image
+qcow2-create-opts.backing_fmt=str - Image format of the base image
+qcow2-create-opts.cluster_size=size - qcow2 cluster size
+qcow2-create-opts.compat=str - Compatibility level (0.10 or 1.1)
+qcow2-create-opts.encrypt.cipher-alg=str - Name of encryption cipher algorithm
+qcow2-create-opts.encrypt.cipher-mode=str - Name of encryption cipher mode
+qcow2-create-opts.encrypt.format=str - Encrypt the image, format choices: 'aes', 'luks'
+qcow2-create-opts.encrypt.hash-alg=str - Name of encryption hash algorithm
+qcow2-create-opts.encrypt.iter-time=num - Time to spend in PBKDF in milliseconds
+qcow2-create-opts.encrypt.ivgen-alg=str - Name of IV generator algorithm
+qcow2-create-opts.encrypt.ivgen-hash-alg=str - Name of IV generator hash algorithm
+qcow2-create-opts.encrypt.key-secret=str - ID of secret providing qcow AES key or LUKS passphrase
+qcow2-create-opts.encryption=bool (on/off) - Encrypt the image with format 'aes'. (Deprecated in favor of encrypt.format=aes)
+qcow2-create-opts.lazy_refcounts=bool (on/off) - Postpone refcount updates
+qcow2-create-opts.preallocation=str - Preallocation mode (allowed values: off, metadata, falloc, full)
+qcow2-create-opts.refcount_bits=num - Width of a reference count entry in bits
+qcow2-create-opts.size=size - Virtual disk size
 
 Note that not all of these options may be amendable.
 
 Testing: convert -o help
 Supported options:
-size             Virtual disk size
+size=size - Virtual disk size
 
 Testing: amend -f bochs -o help
 qemu-img: Format driver 'bochs' does not support option amendment