* [PATCH] iotests/279: Fix for non-qcow2 formats
@ 2019-12-19 14:42 Max Reitz
2019-12-23 23:47 ` John Snow
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Max Reitz @ 2019-12-19 14:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
First, driver=qcow2 will not work so well with non-qcow2 formats (and
this test claims to support qcow, qed, and vmdk).
Second, vmdk will always report the backing file format to be vmdk.
Filter that out so the output looks like for all other formats.
Third, the flat vmdk subformats do not support backing files, so they
will not work with this test.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/279 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279
index 6682376808..30d29b1cb2 100755
--- a/tests/qemu-iotests/279
+++ b/tests/qemu-iotests/279
@@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2 vmdk qed
_supported_proto file
_supported_os Linux
+_unsupported_imgopts "subformat=monolithicFlat" \
+ "subformat=twoGbMaxExtentFlat" \
TEST_IMG="$TEST_IMG.base" _make_test_img 64M
TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base"
@@ -45,11 +47,12 @@ _make_test_img -b "$TEST_IMG.mid"
echo
echo '== qemu-img info --backing-chain =='
-_img_info --backing-chain | _filter_img_info
+_img_info --backing-chain | _filter_img_info | grep -v 'backing file format'
echo
echo '== qemu-img info --backing-chain --image-opts =='
-TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts | _filter_img_info
+TEST_IMG="driver=$IMGFMT,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts \
+ | _filter_img_info | grep -v 'backing file format'
# success, all done
echo "*** done"
--
2.23.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] iotests/279: Fix for non-qcow2 formats
2019-12-19 14:42 [PATCH] iotests/279: Fix for non-qcow2 formats Max Reitz
@ 2019-12-23 23:47 ` John Snow
2020-01-27 12:44 ` Thomas Huth
2020-02-19 10:29 ` Max Reitz
2 siblings, 0 replies; 4+ messages in thread
From: John Snow @ 2019-12-23 23:47 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On 12/19/19 9:42 AM, Max Reitz wrote:
> First, driver=qcow2 will not work so well with non-qcow2 formats (and
> this test claims to support qcow, qed, and vmdk).
>
> Second, vmdk will always report the backing file format to be vmdk.
> Filter that out so the output looks like for all other formats.
>
> Third, the flat vmdk subformats do not support backing files, so they
> will not work with this test.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/279 | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279
> index 6682376808..30d29b1cb2 100755
> --- a/tests/qemu-iotests/279
> +++ b/tests/qemu-iotests/279
> @@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow qcow2 vmdk qed
> _supported_proto file
> _supported_os Linux
> +_unsupported_imgopts "subformat=monolithicFlat" \
> + "subformat=twoGbMaxExtentFlat" \
>
> TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base"
> @@ -45,11 +47,12 @@ _make_test_img -b "$TEST_IMG.mid"
>
> echo
> echo '== qemu-img info --backing-chain =='
> -_img_info --backing-chain | _filter_img_info
> +_img_info --backing-chain | _filter_img_info | grep -v 'backing file format'
>
> echo
> echo '== qemu-img info --backing-chain --image-opts =='
> -TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts | _filter_img_info
> +TEST_IMG="driver=$IMGFMT,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts \
> + | _filter_img_info | grep -v 'backing file format'
Haha.
Reviewed-by: John Snow <jsnow@redhat.com>
>
> # success, all done
> echo "*** done"
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iotests/279: Fix for non-qcow2 formats
2019-12-19 14:42 [PATCH] iotests/279: Fix for non-qcow2 formats Max Reitz
2019-12-23 23:47 ` John Snow
@ 2020-01-27 12:44 ` Thomas Huth
2020-02-19 10:29 ` Max Reitz
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2020-01-27 12:44 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On 19/12/2019 15.42, Max Reitz wrote:
> First, driver=qcow2 will not work so well with non-qcow2 formats (and
> this test claims to support qcow, qed, and vmdk).
>
> Second, vmdk will always report the backing file format to be vmdk.
> Filter that out so the output looks like for all other formats.
>
> Third, the flat vmdk subformats do not support backing files, so they
> will not work with this test.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/279 | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279
> index 6682376808..30d29b1cb2 100755
> --- a/tests/qemu-iotests/279
> +++ b/tests/qemu-iotests/279
> @@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow qcow2 vmdk qed
> _supported_proto file
> _supported_os Linux
> +_unsupported_imgopts "subformat=monolithicFlat" \
> + "subformat=twoGbMaxExtentFlat" \
>
> TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base"
> @@ -45,11 +47,12 @@ _make_test_img -b "$TEST_IMG.mid"
>
> echo
> echo '== qemu-img info --backing-chain =='
> -_img_info --backing-chain | _filter_img_info
> +_img_info --backing-chain | _filter_img_info | grep -v 'backing file format'
>
> echo
> echo '== qemu-img info --backing-chain --image-opts =='
> -TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts | _filter_img_info
> +TEST_IMG="driver=$IMGFMT,file.driver=file,file.filename=$TEST_IMG" _img_info --backing-chain --image-opts \
> + | _filter_img_info | grep -v 'backing file format'
>
> # success, all done
> echo "*** done"
>
This fixes the problems with "check -qed 279" and "check -vmdk 279" for me.
Tested-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iotests/279: Fix for non-qcow2 formats
2019-12-19 14:42 [PATCH] iotests/279: Fix for non-qcow2 formats Max Reitz
2019-12-23 23:47 ` John Snow
2020-01-27 12:44 ` Thomas Huth
@ 2020-02-19 10:29 ` Max Reitz
2 siblings, 0 replies; 4+ messages in thread
From: Max Reitz @ 2020-02-19 10:29 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 605 bytes --]
On 19.12.19 15:42, Max Reitz wrote:
> First, driver=qcow2 will not work so well with non-qcow2 formats (and
> this test claims to support qcow, qed, and vmdk).
>
> Second, vmdk will always report the backing file format to be vmdk.
> Filter that out so the output looks like for all other formats.
>
> Third, the flat vmdk subformats do not support backing files, so they
> will not work with this test.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/279 | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
Applied to my block branch.
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-19 10:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-19 14:42 [PATCH] iotests/279: Fix for non-qcow2 formats Max Reitz
2019-12-23 23:47 ` John Snow
2020-01-27 12:44 ` Thomas Huth
2020-02-19 10:29 ` Max Reitz
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).