diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-10-19 17:53:10 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-10-23 18:18:22 +0200 |
| commit | 8e9e653038db97bfd343c3fb217b7bf4da765a89 (patch) | |
| tree | 169b740e0ed691b6a209ef2f56c405bcd663eea1 /tests/qemu-iotests/081 | |
| parent | be4b67bc7d99da26b7878f7f45370f50a3bd4af5 (diff) | |
| download | qemu-8e9e653038db97bfd343c3fb217b7bf4da765a89.zip qemu-8e9e653038db97bfd343c3fb217b7bf4da765a89.tar.gz qemu-8e9e653038db97bfd343c3fb217b7bf4da765a89.tar.bz2 | |
iotests: Only create BB if necessary
Tests 071 and 081 test giving references in blockdev-add. It is not
necessary to create a BlockBackend here, so omit it.
While at it, fix up some blockdev-add invocations in the vicinity
(s/raw/$IMGFMT/ in 081, drop the format BDS for blkverify's raw child in
071).
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/081')
| -rwxr-xr-x | tests/qemu-iotests/081 | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 index 51873ff..e4b4c6c 100755 --- a/tests/qemu-iotests/081 +++ b/tests/qemu-iotests/081 @@ -102,17 +102,29 @@ $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": "$IMGFMT", + "file": { + "driver": "file", + "filename": "$TEST_DIR/2.raw" + } + } + } +} +{ "execute": "blockdev-add", + "arguments": { + "options": { "driver": "quorum", "id": "drive0-quorum", "vote-threshold": 2, "children": [ { - "driver": "raw", + "driver": "$IMGFMT", "file": { "driver": "file", "filename": "$TEST_DIR/1.raw" @@ -120,7 +132,7 @@ run_qemu -drive "file=$TEST_DIR/2.raw,format=$IMGFMT,if=none,id=drive2" <<EOF }, "drive2", { - "driver": "raw", + "driver": "$IMGFMT", "file": { "driver": "file", "filename": "$TEST_DIR/3.raw" |