Re: [Qemu-devel] [PATCH v4 03/38] iotests: Only create BB if necessary

[Kevin Wolf <kwolf@redhat.com>]

Am 20.07.2015 um 19:45 hat Max Reitz geschrieben:
> Tests 071 and 081 test giving references in blockdev-add. It is not
> necessary to create a BlockBackend here, so omit it.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Alberto Garcia <berto@igalia.com>
> ---
>  tests/qemu-iotests/071     | 50 ++++++++++++++++++++++++++++++++++++++++++----
>  tests/qemu-iotests/071.out | 12 +++++++----
>  tests/qemu-iotests/081     | 14 ++++++++++++-
>  tests/qemu-iotests/081.out |  5 +++--
>  4 files changed, 70 insertions(+), 11 deletions(-)
> 
> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
> index 9eaa49b..68bedd4 100755
> --- a/tests/qemu-iotests/071
> +++ b/tests/qemu-iotests/071
> @@ -104,11 +104,20 @@ echo
>  echo "=== Testing blkdebug on existing block device ==="
>  echo
>  
> -run_qemu -drive "file=$TEST_IMG,format=raw,if=none,id=drive0" <<EOF
> +run_qemu <<EOF
>  { "execute": "qmp_capabilities" }
>  { "execute": "blockdev-add",
>      "arguments": {
>          "options": {
> +            "node-name": "drive0",
> +            "driver": "file",
> +            "filename": "$TEST_IMG"
> +        }
> +    }
> +}

Any specific reason why format=raw is translated into driver=file here...

> +{ "execute": "blockdev-add",
> +    "arguments": {
> +        "options": {
>              "driver": "$IMGFMT",
>              "id": "drive0-debug",
>              "file": {
> @@ -133,11 +142,23 @@ echo
>  echo "=== Testing blkverify on existing block device ==="
>  echo
>  
> -run_qemu -drive "file=$TEST_IMG,format=$IMGFMT,if=none,id=drive0" <<EOF
> +run_qemu <<EOF
>  { "execute": "qmp_capabilities" }
>  { "execute": "blockdev-add",
>      "arguments": {
>          "options": {
> +            "node-name": "drive0",
> +            "driver": "$IMGFMT",
> +            "file": {
> +                "driver": "file",
> +                "filename": "$TEST_IMG"
> +            }
> +        }
> +    }
> +}
> +{ "execute": "blockdev-add",
> +    "arguments": {
> +        "options": {
>              "driver": "blkverify",
>              "id": "drive0-verify",
>              "test": "drive0",
> @@ -163,11 +184,23 @@ echo
>  echo "=== Testing blkverify on existing raw block device ==="
>  echo
>  
> -run_qemu -drive "file=$TEST_IMG.base,format=raw,if=none,id=drive0" <<EOF
> +run_qemu <<EOF
>  { "execute": "qmp_capabilities" }
>  { "execute": "blockdev-add",
>      "arguments": {
>          "options": {
> +            "node-name": "drive0",
> +            "driver": "raw",
> +            "file": {
> +                "driver": "file",
> +                "filename": "$TEST_IMG.base"
> +            }
> +        }
> +    }
> +}

...but into driver=raw,file.driver=file here?

> +{ "execute": "blockdev-add",
> +    "arguments": {
> +        "options": {
>              "driver": "blkverify",
>              "id": "drive0-verify",
>              "test": {

> diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
> index d9b042c..5c8a8fa 100755
> --- a/tests/qemu-iotests/081
> +++ b/tests/qemu-iotests/081
> @@ -101,11 +101,23 @@ $QEMU_IO -c "open -o $quorum" -c "read -P 0x32 0 $size" | _filter_qemu_io
>  echo
>  echo "== checking mixed reference/option specification =="
>  
> -run_qemu -drive "file=$TEST_DIR/2.raw,format=$IMGFMT,if=none,id=drive2" <<EOF
> +run_qemu <<EOF
>  { "execute": "qmp_capabilities" }
>  { "execute": "blockdev-add",
>      "arguments": {
>          "options": {
> +            "node-name": "drive2",
> +            "driver": "raw",
> +            "file": {
> +                "driver": "file",
> +                "filename": "$TEST_DIR/2.raw"
> +            }
> +        }
> +    }
> +}

And here $IMGFMT becomes raw (which is equivalent, but...)

> +{ "execute": "blockdev-add",
> +    "arguments": {
> +        "options": {
>              "driver": "quorum",
>              "id": "drive0-quorum",
>              "vote-threshold": 2,

Kevin