Signed-off-by: Marc-André Lureau <[email protected]>
---
tests/qemu-iotests/tests/copy-before-write | 42 +++++++++++++++---------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/tests/qemu-iotests/tests/copy-before-write
b/tests/qemu-iotests/tests/copy-before-write
index 11a9562067b..339bd0de644 100755
--- a/tests/qemu-iotests/tests/copy-before-write
+++ b/tests/qemu-iotests/tests/copy-before-write
@@ -85,13 +85,13 @@ class TestCbwError(iotests.QMPTestCase):
'file': 'cbw'
})
- result = self.vm.qmp('human-monitor-command',
- command_line='qemu-io cbw "write 0 1M"')
- write_res = result['return']
+ result = self.vm.qmp('x-qemu-io',
+ device='cbw', command='write 0 1M')
+ write_res = result.get('error', {}).get('desc', '')
- result = self.vm.qmp('human-monitor-command',
- command_line='qemu-io access "read 0 1M"')
- read_res = result['return']
+ result = self.vm.qmp('x-qemu-io',
+ device='access', command='read 0 1M')
+ read_res = result.get('error', {}).get('desc', '')
self.vm.shutdown()
log = self.vm.get_log()
@@ -148,13 +148,13 @@ class TestCbwError(iotests.QMPTestCase):
'file': 'cbw'
})
- result = self.vm.qmp('human-monitor-command',
- command_line='qemu-io cbw "write 0 1M"')
- write_res = result['return']
+ result = self.vm.qmp('x-qemu-io',
+ device='cbw', command='write 0 1M')
+ write_res = result.get('error', {}).get('desc', '')
- result = self.vm.qmp('human-monitor-command',
- command_line='qemu-io access "read 0 1M"')
- read_res = result['return']
+ result = self.vm.qmp('x-qemu-io',
+ device='access', command='read 0 1M')
+ read_res = result.get('error', {}).get('desc', '')
self.vm.shutdown()
log = self.vm.get_log()
@@ -266,18 +266,18 @@ read 1048576/1048576 bytes at offset 0
'file': 'cbw'
})
- result = self.vm.qmp('human-monitor-command',
- command_line='qemu-io cbw "write 0 512K"')
- write1_res = result['return']
+ result = self.vm.qmp('x-qemu-io',
+ device='cbw', command='write 0 512K')
+ write1_res = result.get('error', {}).get('desc', '')
# We need second write to trigger throttling
- result = self.vm.qmp('human-monitor-command',
- command_line='qemu-io cbw "write 512K 512K"')
- write2_res = result['return']
+ result = self.vm.qmp('x-qemu-io',
+ device='cbw', command='write 512K 512K')
+ write2_res = result.get('error', {}).get('desc', '')
- result = self.vm.qmp('human-monitor-command',
- command_line='qemu-io access "read 0 1M"')
- read_res = result['return']
+ result = self.vm.qmp('x-qemu-io',
+ device='access', command='read 0 1M')
+ read_res = result.get('error', {}).get('desc', '')
self.vm.shutdown()
log = self.vm.get_log()
--
2.54.0
