Signed-off-by: Marc-André Lureau <[email protected]>
---
tests/qemu-iotests/124 | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index ab9ea4d8b59d..662cca71d6d7 100755
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -249,10 +249,10 @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
self.assertTrue(iotests.compare_images(last, bitmap.drive['file']))
- 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 do_incremental_simple(self, **kwargs):
@@ -263,12 +263,12 @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
self.create_incremental()
# Three writes: One complete overwrite, one new segment,
# and one partial overlap.
- self.hmp_io_writes(self.drives[0]['id'], (('0xab', 0, 512),
+ self.qmp_io_writes(self.drives[0]['id'], (('0xab', 0, 512),
('0xfe', '16M', '256k'),
('0x64', '32736k', '64k')))
self.create_incremental()
# Three more writes, one of each kind, like above
- self.hmp_io_writes(self.drives[0]['id'], (('0x9a', 0, 512),
+ self.qmp_io_writes(self.drives[0]['id'], (('0x9a', 0, 512),
('0x55', '8M', '352k'),
('0x78', '15872k', '1M')))
self.create_incremental()
@@ -337,7 +337,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
# overwrite [32736, 32799] which will dirty bitmap clusters at
# 32M-64K and 32M. 32M+64K will be left undirtied.
bitmap0 = self.add_bitmap('bitmap0', drive0)
- self.hmp_io_writes(drive0['id'],
+ self.qmp_io_writes(drive0['id'],
(('0xab', 0, 512),
('0xfe', '16M', '256k'),
('0x64', '32736k', '64k')))
@@ -382,7 +382,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
drive0 = self.drives[0]
bitmap0 = self.add_bitmap('bitmap0', drive0)
- self.hmp_io_writes(drive0['id'], (('0xab', 0, 512),
+ self.qmp_io_writes(drive0['id'], (('0xab', 0, 512),
('0xfe', '16M', '256k'),
('0x64', '32736k', '64k')))
bitmap1 = self.add_bitmap('bitmap1', drive0)
@@ -396,7 +396,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
self.wait_until_completed(drive0['id'])
self.files.append(drive0['backup'])
- self.hmp_io_writes(drive0['id'], (('0x9a', 0, 512),
+ self.qmp_io_writes(drive0['id'], (('0x9a', 0, 512),
('0x55', '8M', '352k'),
('0x78', '15872k', '1M')))
# Both bitmaps should be correctly in sync.
@@ -450,10 +450,10 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
# Emulate some writes
if not race:
- self.hmp_io_writes(drive0['id'], (('0xab', 0, 512),
+ self.qmp_io_writes(drive0['id'], (('0xab', 0, 512),
('0xfe', '16M', '256k'),
('0x64', '32736k', '64k')))
- self.hmp_io_writes(drive1['id'], (('0xba', 0, 512),
+ self.qmp_io_writes(drive1['id'], (('0xba', 0, 512),
('0xef', '16M', '256k'),
('0x46', '32736k', '64k')))
@@ -584,7 +584,7 @@ class TestIncrementalBackup(TestIncrementalBackupBase):
size=(65 * 1048576))
# Dirty the image past the old end
- self.vm.hmp_qemu_io(self.drives[0]['id'], 'write 64M 64k')
+ self.vm.qmp_qemu_io(self.drives[0]['id'], 'write 64M 64k')
target = self.prepare_backup(size='65M')
self.create_incremental(target=target)
@@ -640,13 +640,13 @@ class
TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
# Note: at this point, during a normal execution,
# Assume that the VM resumes and begins issuing IO requests here.
- self.hmp_io_writes(drive0['id'], (('0xab', 0, 512),
+ self.qmp_io_writes(drive0['id'], (('0xab', 0, 512),
('0xfe', '16M', '256k'),
('0x64', '32736k', '64k')))
result = self.create_incremental(validate=False)
self.assertFalse(result)
- self.hmp_io_writes(drive0['id'], (('0x9a', 0, 512),
+ self.qmp_io_writes(drive0['id'], (('0x9a', 0, 512),
('0x55', '8M', '352k'),
('0x78', '15872k', '1M')))
self.create_incremental()
@@ -660,7 +660,7 @@ class
TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
drive0 = self.drives[0]
# NB: The blkdebug script here looks for a "flush, read" pattern.
- # The flush occurs in hmp_io_writes, and the read during the block job.
+ # The flush occurs in qmp_io_writes, and the read during the block job.
self.vm.cmd('blockdev-add',
node_name=drive0['id'],
driver=drive0['fmt'],
@@ -687,7 +687,7 @@ class
TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
bitmap = self.add_bitmap('bitmap0', drive0)
# Emulate guest activity
- self.hmp_io_writes(drive0['id'], (('0xab', 0, 512),
+ self.qmp_io_writes(drive0['id'], (('0xab', 0, 512),
('0xfe', '16M', '256k'),
('0x64', '32736k', '64k')))
@@ -750,5 +750,4 @@ class
TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2'],
- supported_protocols=['file'],
- require_hmp=True)
+ supported_protocols=['file'])
--
2.56.0.rc0.29.g47ce80527c56
