[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/17] iotests: Fix 020 for vmdk
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 10/17] iotests: Fix 020 for vmdk |
Date: |
Thu, 23 Nov 2017 03:08:25 +0100 |
vmdk cannot work with anything but vmdk backing files, so make the
backing file be the same format as the overlay.
Reported-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/020 | 9 ++++++---
tests/qemu-iotests/020.out | 6 ++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index d22ab81414..eac5080f83 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -111,10 +111,12 @@ echo
echo 'Testing failing commit'
echo
+TEST_IMG="$TEST_IMG.base" _make_test_img 1M
+
# Create an image with a null backing file to which committing will fail (with
# ENOSPC so we can distinguish the result from some generic EIO which may be
# generated anywhere in the block layer)
-_make_test_img -b "json:{'driver': 'raw',
+_make_test_img -b "json:{'driver': '$IMGFMT',
'file': {
'driver': 'blkdebug',
'inject-error': [{
@@ -123,14 +125,15 @@ _make_test_img -b "json:{'driver': 'raw',
'once': true
}],
'image': {
- 'driver': 'null-co'
+ 'driver': 'file',
+ 'filename': '$TEST_IMG.base'
}}}"
# Just write anything so committing will not be a no-op
$QEMU_IO -c 'writev 0 64k' "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG commit "$TEST_IMG"
-_cleanup_test_img
+_cleanup
# success, all done
echo "*** done"
diff --git a/tests/qemu-iotests/020.out b/tests/qemu-iotests/020.out
index 165b70aa49..4b722b2dd0 100644
--- a/tests/qemu-iotests/020.out
+++ b/tests/qemu-iotests/020.out
@@ -1078,7 +1078,8 @@ No errors were found on the image.
Testing failing commit
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
backing_file=json:{'driver': 'raw',,
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1048576
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
backing_file=json:{'driver': 'IMGFMT',,
'file': {
'driver': 'blkdebug',,
'inject-error': [{
@@ -1087,7 +1088,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT
size=1073741824 backing_file=json:{'d
'once': true
}],,
'image': {
- 'driver': 'null-co'
+ 'driver': 'file',,
+ 'filename': 'TEST_DIR/t.IMGFMT.base'
}}}
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
--
2.13.6
- [Qemu-devel] [PATCH 04/17] block/vmdk: Add blkdebug events, (continued)
- [Qemu-devel] [PATCH 04/17] block/vmdk: Add blkdebug events, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 05/17] iotests: Fix _img_info for backslashes, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 06/17] iotests: Drop format-specific in _filter_img_info, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 07/17] iotests: Forbid 020 for non-file protocols, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 08/17] iotests: Skip 103 for refcount_bits=1, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 09/17] iotests: Disable some tests for compat=0.10, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 12/17] iotests: Fix 059's reference output, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 11/17] iotests: Fix 051 for compat=0.10, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 10/17] iotests: Fix 020 for vmdk,
Max Reitz <=
- [Qemu-devel] [PATCH 13/17] iotests: Fix 067 for compat=0.10, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 14/17] iotests: Make 089 compatible with compat=0.10, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 15/17] iotests: Make 184 image-less, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 17/17] iotests: Filter compat-dependent info in 198, Max Reitz, 2017/11/22
- [Qemu-devel] [PATCH 16/17] iotests: Make 191 work with qcow2 options, Max Reitz, 2017/11/22
- Re: [Qemu-devel] [PATCH 00/17] iotests: Fix iotests for weird formats/options, Max Reitz, 2017/11/22
- Re: [Qemu-devel] [PATCH 00/17] iotests: Fix iotests for weird formats/options, no-reply, 2017/11/22
- Re: [Qemu-devel] [PATCH 00/17] iotests: Fix iotests for weird formats/options, Fam Zheng, 2017/11/23