[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.7 09/15] qemu-iotests: 046: Move version detec
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH for-2.7 09/15] qemu-iotests: 046: Move version detection out from verify_io |
Date: |
Wed, 13 Apr 2016 17:09:58 +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 e0be46c..40c4bc0 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -193,15 +193,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
@@ -262,7 +254,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 -L "$TEST_IMG" | _filter_qemu_io
_check_test_img
--
2.8.0
- [Qemu-devel] [PATCH for-2.7 01/15] block: Add BDRV_O_NO_LOCK, (continued)
- [Qemu-devel] [PATCH for-2.7 01/15] block: Add BDRV_O_NO_LOCK, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 02/15] qapi: Add lock-image in blockdev-add options, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 03/15] blockdev: Add and parse "lock-image" option for block devices, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 04/15] block: Introduce image file locking interface, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 05/15] raw-posix: Implement .bdrv_lockf, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 07/15] qemu-io: Add "-L" option for BDRV_O_NO_LOCK, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 06/15] gluster: Implement .bdrv_lockf, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 08/15] qemu-iotests: 140: Disable image lock for qemu-io access, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 09/15] qemu-iotests: 046: Move version detection out from verify_io,
Fam Zheng <=
- [Qemu-devel] [PATCH for-2.7 11/15] qemu-iotests: Disable image lock when checking test image, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 10/15] qemu-iotests: Fix lock-image for shared disk in test case 091, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 13/15] ahci-test: Specify "lock-image=off" in CLI, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 15/15] block: Turn on image locking by default, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 12/15] qemu-iotests: 051: Disable image lock in the command line, Fam Zheng, 2016/04/13
- [Qemu-devel] [PATCH for-2.7 14/15] ide-test: Specify "lock-image=off" in command lines, Fam Zheng, 2016/04/13
- Re: [Qemu-devel] [PATCH for-2.7 00/15] block: Lock images when opening, Daniel P. Berrange, 2016/04/13
- Re: [Qemu-devel] [PATCH for-2.7 00/15] block: Lock images when opening, Denis V. Lunev, 2016/04/13