* [Qemu-devel] [PATCH for-4.1] iotests: Update 082 expected output
@ 2019-07-08 18:47 Eric Blake
2019-07-08 19:14 ` [Qemu-devel] [Qemu-block] " John Snow
2019-07-09 8:16 ` [Qemu-devel] " Kevin Wolf
0 siblings, 2 replies; 3+ messages in thread
From: Eric Blake @ 2019-07-08 18:47 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, open list:Block layer core, Max Reitz
A recent tweak to the '-o help' output for qemu-img needs to be
reflected into the iotests expected outputs.
Fixes: f7077c98
Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
'git grep -l "0.10 or 1.1" tests' confirms this was the only
output file affected
tests/qemu-iotests/082.out | 54 +++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
index 58de358b38f3..9d4ed4dc9d61 100644
--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -47,7 +47,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -70,7 +70,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -93,7 +93,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -116,7 +116,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -139,7 +139,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -162,7 +162,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -185,7 +185,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -208,7 +208,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -246,7 +246,7 @@ Supported qcow2 options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -327,7 +327,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -350,7 +350,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -373,7 +373,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -396,7 +396,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -419,7 +419,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -442,7 +442,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -465,7 +465,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -488,7 +488,7 @@ Supported options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -526,7 +526,7 @@ Supported qcow2 options:
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -618,7 +618,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -642,7 +642,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -666,7 +666,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -690,7 +690,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -714,7 +714,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -738,7 +738,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -762,7 +762,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -786,7 +786,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
@@ -827,7 +827,7 @@ Creation options for 'qcow2':
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)
+ compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
data_file=<str> - File name of an external data file
data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH for-4.1] iotests: Update 082 expected output
2019-07-08 18:47 [Qemu-devel] [PATCH for-4.1] iotests: Update 082 expected output Eric Blake
@ 2019-07-08 19:14 ` John Snow
2019-07-09 8:16 ` [Qemu-devel] " Kevin Wolf
1 sibling, 0 replies; 3+ messages in thread
From: John Snow @ 2019-07-08 19:14 UTC (permalink / raw)
To: Eric Blake, qemu-devel; +Cc: kwolf, open list:Block layer core, Max Reitz
On 7/8/19 2:47 PM, Eric Blake wrote:
> A recent tweak to the '-o help' output for qemu-img needs to be
> reflected into the iotests expected outputs.
>
> Fixes: f7077c98
> Reported-by: Kevin Wolf <kwolf@redhat.com>
> Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
> ---
>
> 'git grep -l "0.10 or 1.1" tests' confirms this was the only
> output file affected
>
> tests/qemu-iotests/082.out | 54 +++++++++++++++++++-------------------
> 1 file changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
> index 58de358b38f3..9d4ed4dc9d61 100644
> --- a/tests/qemu-iotests/082.out
> +++ b/tests/qemu-iotests/082.out
> @@ -47,7 +47,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -70,7 +70,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -93,7 +93,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -116,7 +116,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -139,7 +139,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -162,7 +162,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -185,7 +185,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -208,7 +208,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -246,7 +246,7 @@ Supported qcow2 options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -327,7 +327,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -350,7 +350,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -373,7 +373,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -396,7 +396,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -419,7 +419,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -442,7 +442,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -465,7 +465,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -488,7 +488,7 @@ Supported options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -526,7 +526,7 @@ Supported qcow2 options:
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -618,7 +618,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -642,7 +642,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -666,7 +666,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -690,7 +690,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -714,7 +714,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -738,7 +738,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -762,7 +762,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -786,7 +786,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
> @@ -827,7 +827,7 @@ Creation options for 'qcow2':
> 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)
> + compat=<str> - Compatibility level (v2 [0.10] or v3 [1.1])
> data_file=<str> - File name of an external data file
> data_file_raw=<bool (on/off)> - The external data file must stay valid as a raw image
> encrypt.cipher-alg=<str> - Name of encryption cipher algorithm
>
--
—js
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] iotests: Update 082 expected output
2019-07-08 18:47 [Qemu-devel] [PATCH for-4.1] iotests: Update 082 expected output Eric Blake
2019-07-08 19:14 ` [Qemu-devel] [Qemu-block] " John Snow
@ 2019-07-09 8:16 ` Kevin Wolf
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2019-07-09 8:16 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-devel, open list:Block layer core, Max Reitz
Am 08.07.2019 um 20:47 hat Eric Blake geschrieben:
> A recent tweak to the '-o help' output for qemu-img needs to be
> reflected into the iotests expected outputs.
>
> Fixes: f7077c98
> Reported-by: Kevin Wolf <kwolf@redhat.com>
> Signed-off-by: Eric Blake <eblake@redhat.com>
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-09 8:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-08 18:47 [Qemu-devel] [PATCH for-4.1] iotests: Update 082 expected output Eric Blake
2019-07-08 19:14 ` [Qemu-devel] [Qemu-block] " John Snow
2019-07-09 8:16 ` [Qemu-devel] " Kevin Wolf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.