[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 29/33] qemu-iotests/124: Avoid blockdev-add with id
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 29/33] qemu-iotests/124: Avoid blockdev-add with id |
Date: |
Thu, 22 Sep 2016 18:29:30 +0200 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/qemu-iotests/124 | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index de7cdbe..2f0bc24 100644
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -49,8 +49,8 @@ def transaction_bitmap_clear(node, name, **kwargs):
def transaction_drive_backup(device, target, **kwargs):
- return transaction_action('drive-backup', device=device, target=target,
- **kwargs)
+ return transaction_action('drive-backup', job_id=device, device=device,
+ target=target, **kwargs)
class Bitmap:
@@ -177,7 +177,8 @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
def create_anchor_backup(self, drive=None):
if drive is None:
drive = self.drives[-1]
- res = self.do_qmp_backup(device=drive['id'], sync='full',
+ res = self.do_qmp_backup(job_id=drive['id'],
+ device=drive['id'], sync='full',
format=drive['fmt'], target=drive['backup'])
self.assertTrue(res)
self.files.append(drive['backup'])
@@ -188,7 +189,8 @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
if bitmap is None:
bitmap = self.bitmaps[-1]
_, reference = bitmap.last_target()
- res = self.do_qmp_backup(device=bitmap.drive['id'], sync='full',
+ res = self.do_qmp_backup(job_id=bitmap.drive['id'],
+ device=bitmap.drive['id'], sync='full',
format=bitmap.drive['fmt'], target=reference)
self.assertTrue(res)
@@ -221,7 +223,8 @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
parent, _ = bitmap.last_target()
target = self.prepare_backup(bitmap, parent)
- res = self.do_qmp_backup(device=bitmap.drive['id'],
+ res = self.do_qmp_backup(job_id=bitmap.drive['id'],
+ device=bitmap.drive['id'],
sync='incremental', bitmap=bitmap.name,
format=bitmap.drive['fmt'], target=target,
mode='existing')
@@ -414,7 +417,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
# Create a blkdebug interface to this img as 'drive1'
result = self.vm.qmp('blockdev-add', options={
- 'id': drive1['id'],
+ 'node-name': drive1['id'],
'driver': drive1['fmt'],
'file': {
'driver': 'blkdebug',
@@ -558,7 +561,7 @@ class
TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
drive0 = self.drives[0]
result = self.vm.qmp('blockdev-add', options={
- 'id': drive0['id'],
+ 'node-name': drive0['id'],
'driver': drive0['fmt'],
'file': {
'driver': 'blkdebug',
--
1.8.3.1
- [Qemu-devel] [PULL 19/33] block: Accept device model name for blockdev-change-medium, (continued)
- [Qemu-devel] [PULL 19/33] block: Accept device model name for blockdev-change-medium, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 21/33] qemu-iotests/118: Test media change with qdev name, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 25/33] qemu-iotests/081: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 23/33] qemu-iotests/067: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 22/33] qemu-iotests/041: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 20/33] block: Accept device model name for block_set_io_throttle, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 26/33] qemu-iotests/087: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 24/33] qemu-iotests/071: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 27/33] qemu-iotests/117: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 28/33] qemu-iotests/118: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 29/33] qemu-iotests/124: Avoid blockdev-add with id,
Kevin Wolf <=
- [Qemu-devel] [PULL 32/33] qemu-iotests/141: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 33/33] block: Remove BB interface from blockdev-add/del, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 30/33] qemu-iotests/139: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 31/33] block: Avoid printing NULL string in error messages, Kevin Wolf, 2016/09/22
- Re: [Qemu-devel] [PULL 00/33] Block layer patches, Peter Maydell, 2016/09/23