[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH v5 20/27] qemu-iotests: 046: Move version detect
From: |
Max Reitz |
Subject: |
Re: [Qemu-block] [PATCH v5 20/27] qemu-iotests: 046: Move version detection out from verify_io |
Date: |
Wed, 25 May 2016 15:23:27 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 |
On 17.05.2016 09:35, Fam Zheng wrote:
> 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..365658e 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 -L "$TEST_IMG" | _filter_qemu_io
With the code movement, the -L becomes unnecessary here.
Max
>
> _check_test_img
>
>
signature.asc
Description: OpenPGP digital signature
- Re: [Qemu-block] [PATCH v5 14/27] qemu-img: Add "-L" option to sub commands, (continued)
- [Qemu-block] [PATCH v5 18/27] mirror: Disable image locking on target backing chain, Fam Zheng, 2016/05/17
- [Qemu-block] [PATCH v5 17/27] block: Don't lock drive-backup target image in none mode, Fam Zheng, 2016/05/17
- [Qemu-block] [PATCH v5 19/27] qemu-iotests: 140: Disable image lock for qemu-io access, Fam Zheng, 2016/05/17
- [Qemu-block] [PATCH v5 21/27] qemu-iotests: Wait for QEMU processes before checking image in 091, Fam Zheng, 2016/05/17
- [Qemu-block] [PATCH v5 20/27] qemu-iotests: 046: Move version detection out from verify_io, Fam Zheng, 2016/05/17
- Re: [Qemu-block] [PATCH v5 20/27] qemu-iotests: 046: Move version detection out from verify_io,
Max Reitz <=
- [Qemu-block] [PATCH v5 23/27] iotests: 087: Disable image lock in cases where file is shared, Fam Zheng, 2016/05/17
- [Qemu-block] [PATCH v5 22/27] qemu-iotests: 030: Disable image lock when checking test image, Fam Zheng, 2016/05/17
- [Qemu-block] [PATCH v5 24/27] iotests: Disable image locking in 085, Fam Zheng, 2016/05/17
- [Qemu-block] [PATCH v5 25/27] tests: Use null-co:// instead of /dev/null, Fam Zheng, 2016/05/17
- [Qemu-block] [PATCH v5 26/27] block: Turn on image locking by default, Fam Zheng, 2016/05/17