Merge remote-tracking branch 'remotes/kraxel/tags/vga-20170717-pull-request' into...

[qemu.git] / tests / qemu-iotests / 017

diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 66951eb1a86fc9d40e4675934ca20ad0ce60654f..4f9302db42e30cc4c4e382239d40ba5acd1db368 100755 (executable)
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -25,7 +25,6 @@ seq=`basename $0`
 echo "QA output created by $seq"
 
 here=`pwd`
-tmp=/tmp/$$
 status=1       # failure is the default!
 
 _cleanup()
@@ -42,10 +41,14 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 TEST_OFFSETS="0 4294967296"
 
+TEST_IMG_SAVE=$TEST_IMG
+TEST_IMG=$TEST_IMG.base
 _make_test_img 6G
 
 echo "Filling base image"
@@ -63,8 +66,8 @@ _check_test_img
 echo "Creating test image with backing file"
 echo
 
-mv $TEST_IMG $TEST_IMG.base
-_make_test_img -b $TEST_IMG.base 6G
+TEST_IMG=$TEST_IMG_SAVE
+_make_test_img -b "$TEST_IMG.base" 6G
 
 echo "Filling test image"
 echo