[qemu-xen staging] iotests/197: Fix for non-qcow2 formats

[patchbot@xxxxxxx]

commit afac471b71da92d91cc56fb64c0719b8a4a2d96b
Author:     Max Reitz <mreitz@xxxxxxxxxx>
AuthorDate: Tue Jul 28 15:11:34 2020 +0200
Commit:     Max Reitz <mreitz@xxxxxxxxxx>
CommitDate: Tue Jul 28 15:28:56 2020 +0200

    iotests/197: Fix for non-qcow2 formats
    
    While 197 is very much a qcow2 test, and it looks like the partial
    cluster case at the end (introduced in b0ddcbbb36a66a6) is specifically
    a qcow2 case, the whole test scripts actually marks itself to work with
    generic formats (and generic protocols, even).
    
    Said partial cluster case happened to work with non-qcow2 formats as
    well (mostly by accident), but 1855536256 broke that, because it sets
    the compat option, which does not work for non-qcow2 formats.
    
    So go the whole way and force IMGFMT=qcow2 and IMGPROTO=file, as done in
    other places in this test.
    
    Fixes: 1855536256eb0a5708b04b85f744de69559ea323
           ("iotests/197: Fix for compat=0.10")
    Reported-by: Thomas Huth <thuth@xxxxxxxxxx>
    Signed-off-by: Max Reitz <mreitz@xxxxxxxxxx>
    Message-Id: <20200728131134.902519-1-mreitz@xxxxxxxxxx>
    Reviewed-by: Eric Blake <eblake@xxxxxxxxxx>
---
 tests/qemu-iotests/197     | 8 +++++---
 tests/qemu-iotests/197.out | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 121959a09c..a161c89816 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -114,9 +114,11 @@ echo
 
 # Force compat=1.1, because writing zeroes on a v2 image without a
 # backing file would just result in an unallocated cluster
-_make_test_img -o compat=1.1 1024
-$QEMU_IO -f $IMGFMT -C -c 'read 0 1024' "$TEST_IMG" | _filter_qemu_io
-$QEMU_IO -f $IMGFMT -c map "$TEST_IMG"
+# (Also, note that this is really a pure qcow2 test.)
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+    _make_test_img --no-opts -o compat=1.1 1024
+$QEMU_IO -f qcow2 -C -c 'read 0 1024' "$TEST_WRAP" | _filter_qemu_io
+$QEMU_IO -f qcow2 -c map "$TEST_WRAP"
 _check_test_img
 
 # success, all done
diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
index 7ca46be6e4..ad414c3b0e 100644
--- a/tests/qemu-iotests/197.out
+++ b/tests/qemu-iotests/197.out
@@ -26,7 +26,7 @@ Images are identical.
 
 === Partial final cluster ===
 
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1024
+Formatting 'TEST_DIR/t.wrap.IMGFMT', fmt=IMGFMT size=1024
 read 1024/1024 bytes at offset 0
 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 1 KiB (0x400) bytes     allocated at offset 0 bytes (0x0)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging