From e4fd2e9dfca0b592e329eec9ba753914e7941104 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 21 Sep 2016 14:56:06 +0200 Subject: [PATCH] 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 Reviewed-by: Eric Blake --- tests/qemu-iotests/118 | 6 +----- 1 file changed, 1 insertion(+), 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')