diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-09-21 14:56:04 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-09-23 13:45:36 +0200 |
| commit | 5feb08ed8ff18e5fb43e795585c83b4cbdded508 (patch) | |
| tree | a2626b94da8c8f421a5ce7f36aa4371e309f5aac | |
| parent | 26d5fa10ff9a0701bf5860e6548b9eda496b3474 (diff) | |
| download | qemu-5feb08ed8ff18e5fb43e795585c83b4cbdded508.zip | |
qemu-iotests/087: Avoid blockdev-add with id
We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.
The test cases that test conflicts between the 'id' option to
blockdev-add and existing block devices or the 'node-name' of the same
command can be removed because it won't be possible to specify this at
the end of the series.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/087 | 62 | ||||
| -rw-r--r-- | tests/qemu-iotests/087.out | 6 |
2 files changed, 6 insertions, 62 deletions
diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index e7bca37efc..5c04577b36 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -77,50 +77,12 @@ echo echo === Duplicate ID === echo -run_qemu <<EOF +run_qemu -drive driver=$IMGFMT,id=disk,node-name=test-node,file="$TEST_IMG" <<EOF { "execute": "qmp_capabilities" } { "execute": "blockdev-add", "arguments": { "options": { "driver": "$IMGFMT", - "id": "disk", - "node-name": "test-node", - "file": { - "driver": "file", - "filename": "$TEST_IMG" - } - } - } - } -{ "execute": "blockdev-add", - "arguments": { - "options": { - "driver": "$IMGFMT", - "id": "disk", - "file": { - "driver": "file", - "filename": "$TEST_IMG" - } - } - } - } -{ "execute": "blockdev-add", - "arguments": { - "options": { - "driver": "$IMGFMT", - "id": "test-node", - "file": { - "driver": "file", - "filename": "$TEST_IMG" - } - } - } - } -{ "execute": "blockdev-add", - "arguments": { - "options": { - "driver": "$IMGFMT", - "id": "disk2", "node-name": "disk", "file": { "driver": "file", @@ -133,7 +95,6 @@ run_qemu <<EOF "arguments": { "options": { "driver": "$IMGFMT", - "id": "disk2", "node-name": "test-node", "file": { "driver": "file", @@ -142,19 +103,6 @@ run_qemu <<EOF } } } -{ "execute": "blockdev-add", - "arguments": { - "options": { - "driver": "$IMGFMT", - "id": "disk3", - "node-name": "disk3", - "file": { - "driver": "file", - "filename": "$TEST_IMG" - } - } - } - } { "execute": "quit" } EOF @@ -168,7 +116,7 @@ run_qemu <<EOF "arguments": { "options": { "driver": "$IMGFMT", - "id": "disk", + "node-name": "disk", "aio": "native", "file": { "driver": "file", @@ -191,7 +139,7 @@ run_qemu -S <<EOF "arguments": { "options": { "driver": "$IMGFMT", - "id": "disk", + "node-name": "disk", "file": { "driver": "file", "filename": "$TEST_IMG" @@ -208,7 +156,7 @@ run_qemu <<EOF "arguments": { "options": { "driver": "$IMGFMT", - "id": "disk", + "node-name": "disk", "file": { "driver": "file", "filename": "$TEST_IMG" @@ -229,7 +177,7 @@ run_qemu -S <<EOF { "execute": "blockdev-add", "arguments": { "options": { - "id": "disk" + "node-name": "disk" } } } diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out index a95c4b0be8..f2d6f96805 100644 --- a/tests/qemu-iotests/087.out +++ b/tests/qemu-iotests/087.out @@ -13,15 +13,11 @@ QMP_VERSION === Duplicate ID === -Testing: +Testing: -drive driver=IMGFMT,id=disk,node-name=test-node,file=TEST_DIR/t.IMGFMT QMP_VERSION {"return": {}} -{"return": {}} -{"error": {"class": "GenericError", "desc": "Device with id 'disk' already exists"}} -{"error": {"class": "GenericError", "desc": "Device name 'test-node' conflicts with an existing node name"}} {"error": {"class": "GenericError", "desc": "node-name=disk is conflicting with a device id"}} {"error": {"class": "GenericError", "desc": "Duplicate node name"}} -{"error": {"class": "GenericError", "desc": "Device name 'disk3' conflicts with an existing node name"}} {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"} |