From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqGos-0006zn-Mv for qemu-devel@nongnu.org; Wed, 13 Apr 2016 05:10:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqGor-0001rd-Qj for qemu-devel@nongnu.org; Wed, 13 Apr 2016 05:10:42 -0400 From: Fam Zheng Date: Wed, 13 Apr 2016 17:09:58 +0800 Message-Id: <1460538604-12132-10-git-send-email-famz@redhat.com> In-Reply-To: <1460538604-12132-1-git-send-email-famz@redhat.com> References: <1460538604-12132-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH for-2.7 09/15] qemu-iotests: 046: Move version detection out from verify_io List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Max Reitz , Jeff Cody , Markus Armbruster , Eric Blake , John Snow , qemu-block@nongnu.org, berrange@redhat.com, pbonzini@redhat.com, den@openvz.org So the image lock won't complain. Signed-off-by: Fam Zheng --- 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