From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn6tC-0006mh-Hn for qemu-devel@nongnu.org; Thu, 22 Sep 2016 12:30:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bn6tA-0005WZ-Lp for qemu-devel@nongnu.org; Thu, 22 Sep 2016 12:30:21 -0400 From: Kevin Wolf Date: Thu, 22 Sep 2016 18:29:29 +0200 Message-Id: <1474561774-19256-29-git-send-email-kwolf@redhat.com> In-Reply-To: <1474561774-19256-1-git-send-email-kwolf@redhat.com> References: <1474561774-19256-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 28/33] qemu-iotests/118: Avoid blockdev-add with id List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 0380069..e63a40f 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') -- 1.8.3.1