summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-09-21 14:56:06 +0200
committerKevin Wolf <kwolf@redhat.com>2016-09-23 13:45:36 +0200
commite4fd2e9dfca0b592e329eec9ba753914e7941104 (patch)
treec444a3fb0530b165b3b610915c7685dcd76f4b48
parent1f4c4d73617ac3501b44c67fbfe614482921574c (diff)
downloadqemu-e4fd2e9dfca0b592e329eec9ba753914e7941104.zip
qemu-iotests/118: 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. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
-rwxr-xr-xtests/qemu-iotests/1186
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index 0380069ef6..e63a40fa94 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -648,13 +648,9 @@ class TestBlockJobsAfterCycle(ChangeBaseClass):
qemu_img('create', '-f', iotests.imgfmt, old_img, '1M')
self.vm = iotests.VM()
+ self.vm.add_drive_raw("id=drive0,driver=null-co,if=none")
self.vm.launch()
- result = self.vm.qmp('blockdev-add',
- options={'id': 'drive0',
- 'driver': 'null-co'})
- self.assert_qmp(result, 'return', {})
-
result = self.vm.qmp('query-block')
self.assert_qmp(result, 'return[0]/inserted/image/format', 'null-co')