jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
qemu-iotests/124: 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>
+10
-7
+10
-7
tests/qemu-iotests/124
+10
-7
tests/qemu-iotests/124
···
49
49
50
50
51
51
def transaction_drive_backup(device, target, **kwargs):
52
-
return transaction_action('drive-backup', device=device, target=target,
53
-
**kwargs)
52
+
return transaction_action('drive-backup', job_id=device, device=device,
53
+
target=target, **kwargs)
54
54
55
55
56
56
class Bitmap:
···
177
177
def create_anchor_backup(self, drive=None):
178
178
if drive is None:
179
179
drive = self.drives[-1]
180
-
res = self.do_qmp_backup(device=drive['id'], sync='full',
180
+
res = self.do_qmp_backup(job_id=drive['id'],
181
+
device=drive['id'], sync='full',
181
182
format=drive['fmt'], target=drive['backup'])
182
183
self.assertTrue(res)
183
184
self.files.append(drive['backup'])
···
188
189
if bitmap is None:
189
190
bitmap = self.bitmaps[-1]
190
191
_, reference = bitmap.last_target()
191
-
res = self.do_qmp_backup(device=bitmap.drive['id'], sync='full',
192
+
res = self.do_qmp_backup(job_id=bitmap.drive['id'],
193
+
device=bitmap.drive['id'], sync='full',
192
194
format=bitmap.drive['fmt'], target=reference)
193
195
self.assertTrue(res)
194
196
···
221
223
parent, _ = bitmap.last_target()
222
224
223
225
target = self.prepare_backup(bitmap, parent)
224
-
res = self.do_qmp_backup(device=bitmap.drive['id'],
226
+
res = self.do_qmp_backup(job_id=bitmap.drive['id'],
227
+
device=bitmap.drive['id'],
225
228
sync='incremental', bitmap=bitmap.name,
226
229
format=bitmap.drive['fmt'], target=target,
227
230
mode='existing')
···
414
417
415
418
# Create a blkdebug interface to this img as 'drive1'
416
419
result = self.vm.qmp('blockdev-add', options={
417
-
'id': drive1['id'],
420
+
'node-name': drive1['id'],
418
421
'driver': drive1['fmt'],
419
422
'file': {
420
423
'driver': 'blkdebug',
···
558
561
559
562
drive0 = self.drives[0]
560
563
result = self.vm.qmp('blockdev-add', options={
561
-
'id': drive0['id'],
564
+
'node-name': drive0['id'],
562
565
'driver': drive0['fmt'],
563
566
'file': {
564
567
'driver': 'blkdebug',