diff options
Diffstat (limited to 'tests/qemu-iotests')
| -rwxr-xr-x | tests/qemu-iotests/089 | 3 | ||||
| -rw-r--r-- | tests/qemu-iotests/089.out | 4 | ||||
| -rwxr-xr-x | tests/qemu-iotests/091 | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index ef476010c0..dffc977e1c 100755 --- a/tests/qemu-iotests/089 +++ b/tests/qemu-iotests/089 @@ -107,8 +107,7 @@ echo echo "=== Testing qemu-img info output ===" echo -$QEMU_IMG info "json:{\"driver\":\"qcow2\",\"file.filename\":\"$TEST_IMG\"}" \ - | _filter_testdir | _filter_imgfmt +TEST_IMG="json:{\"driver\":\"qcow2\",\"file.filename\":\"$TEST_IMG\"}" _img_info echo diff --git a/tests/qemu-iotests/089.out b/tests/qemu-iotests/089.out index d6cf7835d8..4ca2f88e6a 100644 --- a/tests/qemu-iotests/089.out +++ b/tests/qemu-iotests/089.out @@ -31,11 +31,7 @@ read failed: Input/output error image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 64M (67108864 bytes) -disk size: 324K cluster_size: 65536 -Format specific information: - compat: 1.1 - lazy refcounts: false === Testing option merging === diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 index 384b3ace54..32bbd56975 100755 --- a/tests/qemu-iotests/091 +++ b/tests/qemu-iotests/091 @@ -47,6 +47,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 _supported_proto file _supported_os Linux +_default_cache_mode "none" +_supported_cache_modes "writethrough" "none" "writeback" size=1G @@ -59,13 +61,13 @@ echo === Starting QEMU VM1 === echo qemu_comm_method="monitor" -_launch_qemu -drive file="${TEST_IMG}",cache=none,id=disk +_launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk h1=$QEMU_HANDLE echo echo === Starting QEMU VM2 === echo -_launch_qemu -drive file="${TEST_IMG}",cache=none,id=disk \ +_launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk \ -incoming "exec: cat '${MIG_FIFO}'" h2=$QEMU_HANDLE |