[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 15/22] qemu-iotests: 046: Move version detection
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v6 15/22] qemu-iotests: 046: Move version detection out from verify_io |
Date: |
Fri, 3 Jun 2016 16:49:09 +0800 |
So the image lock won't complain.
Signed-off-by: Fam Zheng <address@hidden>
---
tests/qemu-iotests/046 | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index e528b67..f15ccbf 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -192,15 +192,7 @@ echo "== Verify image content =="
function verify_io()
{
- if ($QEMU_IMG info -f "$IMGFMT" "$TEST_IMG" | grep "compat: 0.10" >
/dev/null); then
- # For v2 images, discarded clusters are read from the backing file
- # Keep the variable empty so that the backing file value can be used as
- # the default below
- discarded=
- else
- # Discarded clusters are zeroed for v3 or later
- discarded=0
- fi
+ discarded=$1
echo read -P 0 0 0x10000
@@ -261,7 +253,17 @@ function verify_io()
echo read -P 17 0x11c000 0x4000
}
-verify_io | $QEMU_IO "$TEST_IMG" | _filter_qemu_io
+if ($QEMU_IMG info -f "$IMGFMT" "$TEST_IMG" | grep "compat: 0.10" >
/dev/null); then
+ # For v2 images, discarded clusters are read from the backing file
+ # Keep the variable empty so that the backing file value can be used as
+ # the default below
+ discarded=
+else
+ # Discarded clusters are zeroed for v3 or later
+ discarded=0
+fi
+
+verify_io $discarded | $QEMU_IO "$TEST_IMG" | _filter_qemu_io
_check_test_img
--
2.8.2
- Re: [Qemu-devel] [PATCH v6 08/22] raw-posix: Add image locking support, (continued)
- [Qemu-devel] [PATCH v6 12/22] qemu-nbd: Add "--no-lock/-L" option, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 10/22] qemu-img: Add "-L" option to sub commands, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 13/22] block: Don't lock drive-backup target image in none mode, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 11/22] qemu-img: Update documentation of "-L" option, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 14/22] mirror: Disable image locking on target backing chain, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 17/22] qemu-iotests: 030: Disable image locking when checking test image, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 16/22] qemu-iotests: Wait for QEMU processes before checking image in 091, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 15/22] qemu-iotests: 046: Move version detection out from verify_io,
Fam Zheng <=
- [Qemu-devel] [PATCH v6 18/22] iotests: 087: Disable image locking in cases where file is shared, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 19/22] iotests: Disable image locking in 085, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 20/22] tests: Use null-co:// instead of /dev/null, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 21/22] block: Turn on image locking by default, Fam Zheng, 2016/06/03
- [Qemu-devel] [PATCH v6 22/22] qemu-iotests: Add test case 153 for image locking, Fam Zheng, 2016/06/03