Re: [Qemu-devel] [PATCH v5 20/27] qemu-iotests: 046: Move version detection out from verify_io

[Max Reitz <mreitz@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1700 bytes --]

On 17.05.2016 09:35, Fam Zheng wrote:
> So the image lock won't complain.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  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
>  
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]