diff options
author | Kevin Wolf <kwolf@redhat.com> | 2016-09-21 14:56:01 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2016-09-23 13:45:36 +0200 |
commit | 522ce4ecd4e93f77ba4cd399b25db1fd5405c7e9 (patch) | |
tree | c39d04d55a7797377c415b4eef3bdf390734b34b /tests/qemu-iotests/067 | |
parent | 476fb028bf21cd44f5e3a72c856147a00e74f670 (diff) |
qemu-iotests/067: 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.
In order to keep the test meaningful, some instances of query-block that
want to check whether the node still exists and would now turn up empty
must be converted to query-named-block-nodes (which also return the
protocol level node, but that shouldn't hurt).
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/067')
-rwxr-xr-x | tests/qemu-iotests/067 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index c1df48eded..a12125bd46 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -121,7 +121,7 @@ run_qemu <<EOF "arguments": { "options": { "driver": "$IMGFMT", - "id": "disk", + "node-name": "disk", "file": { "driver": "file", "filename": "$TEST_IMG" @@ -129,13 +129,13 @@ run_qemu <<EOF } } } -{ "execute": "query-block" } +{ "execute": "query-named-block-nodes" } { "execute": "device_add", "arguments": { "driver": "virtio-blk", "drive": "disk", "id": "virtio0" } } { "execute": "device_del", "arguments": { "id": "virtio0" } } { "execute": "system_reset" } -{ "execute": "query-block" } +{ "execute": "query-named-block-nodes" } { "execute": "quit" } EOF |