[Qemu-devel] [PATCH 0/3] qemu-iotests: fix for vmdk

[Qemu-devel] [PATCH 0/3] qemu-iotests: fix for vmdk

[Fam Zheng]

When testing vmdk, qemu-iotests fails on 017, 018, 042 and 043 for trivial
reasons. These patches try to fix those cases to pass tests on all four
subformats of vmdk {monolithicSparse monolithicFlat twoGbMaxExtentSparse
twoGbMaxExtentFlat}.

Fam Zheng (3):
  qemu-iotests: exclude vmdk for test 042
  qemu-iotests: exclude vmdk from 043
  qemu-iotests: fix 017 018 for vmdk

 tests/qemu-iotests/017     | 4 +++-
 tests/qemu-iotests/017.out | 2 +-
 tests/qemu-iotests/018     | 4 +++-
 tests/qemu-iotests/018.out | 2 +-
 tests/qemu-iotests/042     | 2 +-
 tests/qemu-iotests/043     | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

-- 
1.8.1.4

[Qemu-devel] [PATCH 1/3] qemu-iotests: exclude vmdk for test 042

[Fam Zheng]

Zero sized disk is not supported by qemu vmdk driver, exclude vmdk from
the test script.

As tested on vmware-vdiskmanager and vmware workstation, zero sized disk
is not supported by vmware, either.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/042 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
index c3c3ca8..16b2fdb 100755
--- a/tests/qemu-iotests/042
+++ b/tests/qemu-iotests/042
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-_supported_fmt qcow2 qcow qed vmdk
+_supported_fmt qcow2 qcow qed
 _supported_proto file
 _supported_os Linux
 
-- 
1.8.1.4

[Qemu-devel] [PATCH 2/3] qemu-iotests: exclude vmdk from 043

[Fam Zheng]

043 tests recursive backing file by changing backing file. VMDK has not
implemented this yet.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/043 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index 3ba08dc..dd06c37 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 # Any format supporting backing files
-_supported_fmt qcow qcow2 vmdk qed
+_supported_fmt qcow qcow2 qed
 _supported_proto generic
 _supported_os Linux
 
-- 
1.8.1.4

[Qemu-devel] [PATCH 3/3] qemu-iotests: fix 017 018 for vmdk

[Fam Zheng]

017 and 018 use /bin/mv to move base img from t.IMGFMG to t.IMGFMT.base
after filling data, this is not enough for vmdk, when t.IMGFMT is only a
description text file who points to t-{flat,s001,f001,...}.IMGFMT as
data extent, so testing such subformats alway fails on them.

This patch use the trick of temprorily changing TEST_IMG to avoid using
/bin/mv.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/017     | 4 +++-
 tests/qemu-iotests/017.out | 2 +-
 tests/qemu-iotests/018     | 4 +++-
 tests/qemu-iotests/018.out | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 66951eb..45f2c0b 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -46,6 +46,8 @@ _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 
+TEST_IMG_SAVE=$TEST_IMG
+TEST_IMG=$TEST_IMG.base
 _make_test_img 6G
 
 echo "Filling base image"
@@ -63,7 +65,7 @@ _check_test_img
 echo "Creating test image with backing file"
 echo
 
-mv $TEST_IMG $TEST_IMG.base
+TEST_IMG=$TEST_IMG_SAVE
 _make_test_img -b $TEST_IMG.base 6G
 
 echo "Filling test image"
diff --git a/tests/qemu-iotests/017.out b/tests/qemu-iotests/017.out
index a861e58..df34ee7 100644
--- a/tests/qemu-iotests/017.out
+++ b/tests/qemu-iotests/017.out
@@ -1,5 +1,5 @@
 QA output created by 017
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
 Filling base image
 
 === IO: pattern 0
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index bd2db78..453ce61 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -46,6 +46,8 @@ _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"
 
+TEST_IMG_SAVE=$TEST_IMG
+TEST_IMG=$TEST_IMG.base
 _make_test_img 6G
 
 echo "Filling base image"
@@ -63,7 +65,7 @@ _check_test_img
 echo "Creating test image with backing file"
 echo
 
-mv $TEST_IMG $TEST_IMG.base
+TEST_IMG=$TEST_IMG_SAVE
 _make_test_img -b $TEST_IMG.base 6G
 
 echo "Filling test image"
diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out
index 6bbd815..3ddb8d8 100644
--- a/tests/qemu-iotests/018.out
+++ b/tests/qemu-iotests/018.out
@@ -1,5 +1,5 @@
 QA output created by 018
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
 Filling base image
 
 === IO: pattern 0
-- 
1.8.1.4

Re: [Qemu-devel] [PATCH 2/3] qemu-iotests: exclude vmdk from 043

[Jeff Cody]

On Tue, May 07, 2013 at 07:13:04PM +0800, Fam Zheng wrote:
> 043 tests recursive backing file by changing backing file. VMDK has not
> implemented this yet.
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/043 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
> index 3ba08dc..dd06c37 100755
> --- a/tests/qemu-iotests/043
> +++ b/tests/qemu-iotests/043
> @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>  . ./common.filter
>  
>  # Any format supporting backing files
> -_supported_fmt qcow qcow2 vmdk qed
> +_supported_fmt qcow qcow2 qed
>  _supported_proto generic
>  _supported_os Linux
>  
> -- 
> 1.8.1.4
> 
> 

Reviewed-by: Jeff Cody <jcody@redhat.com>

Re: [Qemu-devel] [PATCH 1/3] qemu-iotests: exclude vmdk for test 042

[Jeff Cody]

On Tue, May 07, 2013 at 07:13:03PM +0800, Fam Zheng wrote:
> Zero sized disk is not supported by qemu vmdk driver, exclude vmdk from
> the test script.
> 
> As tested on vmware-vdiskmanager and vmware workstation, zero sized disk
> is not supported by vmware, either.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/042 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
> index c3c3ca8..16b2fdb 100755
> --- a/tests/qemu-iotests/042
> +++ b/tests/qemu-iotests/042
> @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>  . ./common.rc
>  . ./common.filter
>  
> -_supported_fmt qcow2 qcow qed vmdk
> +_supported_fmt qcow2 qcow qed
>  _supported_proto file
>  _supported_os Linux
>  
> -- 
> 1.8.1.4
> 
>

Reviewed-by: Jeff Cody <jcody@redhat.com>

Re: [Qemu-devel] [PATCH 3/3] qemu-iotests: fix 017 018 for vmdk

[Jeff Cody]

On Tue, May 07, 2013 at 07:13:05PM +0800, Fam Zheng wrote:
> 017 and 018 use /bin/mv to move base img from t.IMGFMG to t.IMGFMT.base
> after filling data, this is not enough for vmdk, when t.IMGFMT is only a
> description text file who points to t-{flat,s001,f001,...}.IMGFMT as
> data extent, so testing such subformats alway fails on them.
> 
> This patch use the trick of temprorily changing TEST_IMG to avoid using
> /bin/mv.

s/temprorily/temporarily/


Other than that, I ran the tests locally here and verified vmdk, qcow,
qcow2, and qed pass both 17 and 18, so the patch itself looks good to
me.

> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/017     | 4 +++-
>  tests/qemu-iotests/017.out | 2 +-
>  tests/qemu-iotests/018     | 4 +++-
>  tests/qemu-iotests/018.out | 2 +-
>  4 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
> index 66951eb..45f2c0b 100755
> --- a/tests/qemu-iotests/017
> +++ b/tests/qemu-iotests/017
> @@ -46,6 +46,8 @@ _supported_os Linux
>  
>  TEST_OFFSETS="0 4294967296"
>  
> +TEST_IMG_SAVE=$TEST_IMG
> +TEST_IMG=$TEST_IMG.base
>  _make_test_img 6G
>  
>  echo "Filling base image"
> @@ -63,7 +65,7 @@ _check_test_img
>  echo "Creating test image with backing file"
>  echo
>  
> -mv $TEST_IMG $TEST_IMG.base
> +TEST_IMG=$TEST_IMG_SAVE
>  _make_test_img -b $TEST_IMG.base 6G
>  
>  echo "Filling test image"
> diff --git a/tests/qemu-iotests/017.out b/tests/qemu-iotests/017.out
> index a861e58..df34ee7 100644
> --- a/tests/qemu-iotests/017.out
> +++ b/tests/qemu-iotests/017.out
> @@ -1,5 +1,5 @@
>  QA output created by 017
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
> +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
>  Filling base image
>  
>  === IO: pattern 0
> diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
> index bd2db78..453ce61 100755
> --- a/tests/qemu-iotests/018
> +++ b/tests/qemu-iotests/018
> @@ -46,6 +46,8 @@ _supported_os Linux
>  
>  TEST_OFFSETS="0 4294967296"
>  
> +TEST_IMG_SAVE=$TEST_IMG
> +TEST_IMG=$TEST_IMG.base
>  _make_test_img 6G
>  
>  echo "Filling base image"
> @@ -63,7 +65,7 @@ _check_test_img
>  echo "Creating test image with backing file"
>  echo
>  
> -mv $TEST_IMG $TEST_IMG.base
> +TEST_IMG=$TEST_IMG_SAVE
>  _make_test_img -b $TEST_IMG.base 6G
>  
>  echo "Filling test image"
> diff --git a/tests/qemu-iotests/018.out b/tests/qemu-iotests/018.out
> index 6bbd815..3ddb8d8 100644
> --- a/tests/qemu-iotests/018.out
> +++ b/tests/qemu-iotests/018.out
> @@ -1,5 +1,5 @@
>  QA output created by 018
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 
> +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944
>  Filling base image
>  
>  === IO: pattern 0
> -- 
> 1.8.1.4
> 
> 

Re: [Qemu-devel] [PATCH 0/3] qemu-iotests: fix for vmdk

[Kevin Wolf]

Am 07.05.2013 um 13:13 hat Fam Zheng geschrieben:
> When testing vmdk, qemu-iotests fails on 017, 018, 042 and 043 for trivial
> reasons. These patches try to fix those cases to pass tests on all four
> subformats of vmdk {monolithicSparse monolithicFlat twoGbMaxExtentSparse
> twoGbMaxExtentFlat}.
> 
> Fam Zheng (3):
>   qemu-iotests: exclude vmdk for test 042
>   qemu-iotests: exclude vmdk from 043
>   qemu-iotests: fix 017 018 for vmdk

Thanks, applied all to the block branch.

I extended patch 2 to also remove qcow1, which doesn't support changing
the backing file either.

Kevin