From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 21 Sep 2016 12:56:05 +0000 (+0200)
Subject: qemu-iotests/117: Avoid blockdev-add with id
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1f4c4d73617ac3501b44c67fbfe614482921574c;p=qemu.git

qemu-iotests/117: 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>
---

diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index 9385b3f8da..5b28039e17 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -52,14 +52,14 @@ _send_qemu_cmd $QEMU_HANDLE \
 
 _send_qemu_cmd $QEMU_HANDLE \
     "{ 'execute': 'blockdev-add',
-       'arguments': { 'options': { 'id': 'protocol',
+       'arguments': { 'options': { 'node-name': 'protocol',
                                    'driver': 'file',
                                    'filename': '$TEST_IMG' } } }" \
     'return'
 
 _send_qemu_cmd $QEMU_HANDLE \
     "{ 'execute': 'blockdev-add',
-       'arguments': { 'options': { 'id': 'format',
+       'arguments': { 'options': { 'node-name': 'format',
                                    'driver': '$IMGFMT',
                                    'file': 'protocol' } } }" \
     'return'