From 5feb08ed8ff18e5fb43e795585c83b4cbdded508 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 21 Sep 2016 14:56:04 +0200 Subject: 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 Reviewed-by: Eric Blake --- tests/qemu-iotests/087.out | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'tests/qemu-iotests/087.out') diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out index a95c4b0..f2d6f96 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"} -- cgit v1.1