Signed-off-by: Marc-André Lureau <[email protected]>
---
tests/qemu-iotests/056 | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/tests/qemu-iotests/056 b/tests/qemu-iotests/056
index 7cc97486951c..b01b11522bb5 100755
--- a/tests/qemu-iotests/056
+++ b/tests/qemu-iotests/056
@@ -91,8 +91,8 @@ class TestSyncModesNoneAndTop(iotests.QMPTestCase):
self.vm.cmd('drive-backup', device='drive0',
sync='none', target=target_img)
time.sleep(1)
- self.vm.hmp_qemu_io('drive0', 'write -P0x5e 0 512')
- self.vm.hmp_qemu_io('drive0', 'aio_flush')
+ self.vm.qmp_qemu_io('drive0', 'write -P0x5e 0 512')
+ self.vm.qmp_qemu_io('drive0', 'aio_flush')
# Verify that the original contents exist in the target image.
event = self.cancel_and_wait()
@@ -119,7 +119,7 @@ class TestBeforeWriteNotifier(iotests.QMPTestCase):
self.vm.cmd('block-job-pause', device="drive0")
# Speed is low enough that this must be an uncopied range, which will
# trigger the before write notifier
- self.vm.hmp_qemu_io('drive0', 'aio_write -P 1 512512 512')
+ self.vm.qmp_qemu_io('drive0', 'aio_write -P 1 512512 512')
self.vm.resume_drive("drive0")
self.vm.cmd('block-job-resume', device="drive0")
event = self.cancel_and_wait()
@@ -142,10 +142,10 @@ class BackupTest(iotests.QMPTestCase):
try_remove(self.dest_img2)
try_remove(self.ref_img)
- def hmp_io_writes(self, drive, patterns):
+ def qmp_io_writes(self, drive, patterns):
for pattern in patterns:
- self.vm.hmp_qemu_io(drive, 'write -P%s %s %s' % pattern)
- self.vm.hmp_qemu_io(drive, 'flush')
+ self.vm.qmp_qemu_io(drive, 'write -P%s %s %s' % pattern)
+ self.vm.qmp_qemu_io(drive, 'flush')
def qmp_backup_and_wait(self, cmd='drive-backup', serror=None,
aerror=None, **kwargs):
@@ -180,7 +180,7 @@ class BackupTest(iotests.QMPTestCase):
def test_overlapping_writes(self):
# Write something to back up
- self.hmp_io_writes('drive0', [('42', '0M', '2M')])
+ self.qmp_io_writes('drive0', [('42', '0M', '2M')])
# Create a reference backup
self.qmp_backup_and_wait(device='drive0', format=iotests.imgfmt,
@@ -201,7 +201,7 @@ class BackupTest(iotests.QMPTestCase):
self.qmp_backup(device='drive0', format=iotests.imgfmt, sync='full',
target=self.dest_img, speed=1, auto_dismiss=False)
- self.hmp_io_writes('drive0', [('23', '%ik' % (1024 + 64), '64k'),
+ self.qmp_io_writes('drive0', [('23', '%ik' % (1024 + 64), '64k'),
('66', '1M', '1M')])
# Let the job complete
@@ -266,7 +266,7 @@ class BackupTest(iotests.QMPTestCase):
res = self.vm.qmp('query-block-jobs')
self.assert_qmp(res, 'return', [])
# Give blkdebug something to chew on
- self.hmp_io_writes('drive0',
+ self.qmp_io_writes('drive0',
(('0x9a', 0, 512),
('0x55', '8M', '352k'),
('0x78', '15872k', '1M')))
@@ -332,5 +332,4 @@ class BackupTest(iotests.QMPTestCase):
if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2', 'qed'],
- supported_protocols=['file'],
- require_hmp=True)
+ supported_protocols=['file'])
--
2.56.0.rc0.29.g47ce80527c56
