Signed-off-by: Marc-André Lureau <[email protected]>
---
tests/qemu-iotests/060 | 9 ++++-----
tests/qemu-iotests/060.out | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index 8d06f84df16b..c2c1cd815f0f 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -56,7 +56,6 @@ _unsupported_imgopts 'compat=0.10' data_file \
# The repair process will create a large file - so check for availability first
_require_large_file 64G
-_require_hmp
rt_offset=65536 # 0x10000 (XXX: just an assumption)
rb_offset=131072 # 0x20000 (XXX: just an assumption)
@@ -450,8 +449,8 @@ echo
_make_test_img 64M
poke_file "$TEST_IMG" "$rt_offset" "\x00\x00\x00\x00\x00\x00\x00\x00"
echo "{'execute': 'qmp_capabilities'}
- {'execute': 'human-monitor-command',
- 'arguments': {'command-line': 'qemu-io drive \"write 0 512\"'}}
+ {'execute': 'x-qemu-io',
+ 'arguments': {'device': 'drive', 'command': 'write 0 512'}}
{'execute': 'quit'}" \
| $QEMU -qmp stdio -nographic -nodefaults \
-drive if=none,node-name=drive,file="$TEST_IMG",driver=qcow2 \
@@ -469,8 +468,8 @@ poke_file "$TEST_IMG" "$l1_offset"
"\x00\x00\x00\x00\x2a\x2a\x2a\x2a"
# Inactive images are effectively read-only images, so this should be a
# non-fatal corruption (which does not modify the image)
echo "{'execute': 'qmp_capabilities'}
- {'execute': 'human-monitor-command',
- 'arguments': {'command-line': 'qemu-io drive \"read 0 512\"'}}
+ {'execute': 'x-qemu-io',
+ 'arguments': {'device': 'drive', 'command': 'read 0 512'}}
{'execute': 'quit'}" \
| $QEMU -qmp stdio -nographic -nodefaults \
-blockdev "{'node-name': 'drive',
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
index 8870a478231c..833f29c9b031 100644
--- a/tests/qemu-iotests/060.out
+++ b/tests/qemu-iotests/060.out
@@ -419,7 +419,7 @@ qcow2: Marking image as corrupt: Preventing invalid write
on metadata (overlaps
QMP_VERSION
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"BLOCK_IMAGE_CORRUPTED", "data": {"device": "none0", "msg": "Preventing invalid
write on metadata (overlaps with refcount table)", "offset": 65536,
"node-name": "drive", "fatal": true, "size": 65536}}
-{"return": "Error: write failed: Input/output error\r\n"}
+{"error": {"class": "GenericError", "desc": "write failed: Input/output
error"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
{"return": {}}
--
2.56.0.rc0.29.g47ce80527c56
