Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

[mirror_qemu.git] / tests / qemu-iotests / 028

diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index 8321c93d4647189f4d9ae63634cfc7e4a6bd2fc0..a99e4fa2bdf7048edb6a10589d5b38d1ca31809c 100755 (executable)
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files except vmdk and qcow which do not support
 # smaller backing files.
 _supported_fmt qcow2 qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 # Choose a size that is not necessarily a cluster size multiple for image
@@ -64,21 +64,21 @@ echo "Filling base image"
 echo
 
 # Fill end of base image with a pattern, skipping every other sector
-io writev $offset 512 1024 31
+io writev $offset 512 1024 32
 
 _check_test_img
 
 echo "Creating test image with backing file"
 echo
 
-mv $TEST_IMG $TEST_IMG.base
-_make_test_img -b $TEST_IMG.base $image_size
+mv "$TEST_IMG" "$TEST_IMG.base"
+_make_test_img -b "$TEST_IMG.base" $image_size
 
 echo "Filling test image"
 echo
 
 # Write every other sector around where the base image ends
-io writev $(( offset + 512 )) 512 1024 63
+io writev $(( offset + 512 )) 512 1024 64
 
 _check_test_img
 
@@ -86,13 +86,18 @@ echo "Reading"
 echo
 
 # Base image sectors
-io readv $(( offset )) 512 1024 31
+io readv $(( offset )) 512 1024 32
 
 # Image sectors
-io readv $(( offset + 512 )) 512 1024 63
+io readv $(( offset + 512 )) 512 1024 64
 
 # Zero sectors beyond end of base image
-io_zero readv $(( offset + 32 * 1024 )) 512 1024 31
+io_zero readv $(( offset + 32 * 1024 )) 512 1024 32
+
+_check_test_img
+
+# Rebase it on top of its base image
+$QEMU_IMG rebase -b "$TEST_IMG.base" "$TEST_IMG"
 
 _check_test_img