From: John Snow <jsnow@redhat.com>
To: Eric Blake <eblake@redhat.com>, qemu-devel@nongnu.org
Cc: kwolf@redhat.com,
"open list:Block layer core" <qemu-block@nongnu.org>,
Max Reitz <mreitz@redhat.com>
Subject: Re: [Qemu-devel] [Qemu-block] [PATCH for-4.1] iotests: Update 082 expected output
Date: Mon, 8 Jul 2019 15:14:03 -0400 [thread overview]
Message-ID: <72b8331c-7870-c501-3cf6-f48a6bee04e2@redhat.com> (raw)
In-Reply-To: <20190708184703.19251-1-eblake@redhat.com>
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
next prev parent reply other threads:[~2019-07-08 19:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2019-07-09 8:16 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=72b8331c-7870-c501-3cf6-f48a6bee04e2@redhat.com \
--to=jsnow@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).