Signed-off-by: Marc-André Lureau <[email protected]>
---
tests/qemu-iotests/071 | 31 ++++++++++++++++++-------------
tests/qemu-iotests/071.out | 12 ++++--------
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index 83c4ce6314c5..463f5c02349c 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -43,7 +43,6 @@ _require_drivers blkdebug blkverify
# blkdebug can only inject errors on bs->file, not on the data_file,
# so this test does not work with external data files
_unsupported_imgopts data_file
-_require_hmp
do_run_qemu()
{
@@ -140,9 +139,10 @@ run_qemu <<EOF
}
}
}
-{ "execute": "human-monitor-command",
+{ "execute": "x-qemu-io",
"arguments": {
- "command-line": 'qemu-io drive0-debug "read 0 512"'
+ "device": "drive0-debug",
+ "command": "read 0 512"
}
}
{ "execute": "quit" }
@@ -175,9 +175,10 @@ run_qemu <<EOF
}
}
}
-{ "execute": "human-monitor-command",
+{ "execute": "x-qemu-io",
"arguments": {
- "command-line": 'qemu-io drive0-verify "read 0 512"'
+ "device": "drive0-verify",
+ "command": "read 0 512"
}
}
{ "execute": "quit" }
@@ -210,9 +211,10 @@ run_qemu <<EOF
"raw": "drive0"
}
}
-{ "execute": "human-monitor-command",
+{ "execute": "x-qemu-io",
"arguments": {
- "command-line": 'qemu-io drive0-verify "read 0 512"'
+ "device": "drive0-verify",
+ "command": "read 0 512"
}
}
{ "execute": "quit" }
@@ -249,19 +251,22 @@ run_qemu <<EOF
}
}
}
-{ "execute": "human-monitor-command",
+{ "execute": "x-qemu-io",
"arguments": {
- "command-line": 'qemu-io drive0-debug "read 0 512"'
+ "device": "drive0-debug",
+ "command": "read 0 512"
}
}
-{ "execute": "human-monitor-command",
+{ "execute": "x-qemu-io",
"arguments": {
- "command-line": 'qemu-io drive0-debug "write 0 512"'
+ "device": "drive0-debug",
+ "command": "write 0 512"
}
}
-{ "execute": "human-monitor-command",
+{ "execute": "x-qemu-io",
"arguments": {
- "command-line": 'qemu-io drive0-debug "read 0 512"'
+ "device": "drive0-debug",
+ "command": "read 0 512"
}
}
{ "execute": "quit" }
diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out
index 15353aba08b9..1e956d4bc1ec 100644
--- a/tests/qemu-iotests/071.out
+++ b/tests/qemu-iotests/071.out
@@ -43,7 +43,7 @@ QMP_VERSION
{"return": {}}
{"return": {}}
{"return": {}}
-{"return": "Error: read failed: Input/output error\r\n"}
+{"error": {"class": "GenericError", "desc": "read failed: Input/output error"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
{"return": {}}
@@ -75,13 +75,9 @@ QMP_VERSION
{"return": {}}
{"return": {}}
{"return": {}}
-read 512/512 bytes at offset 0
-512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-{"return": ""}
-wrote 512/512 bytes at offset 0
-512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-{"return": ""}
-{"return": "Error: read failed: Input/output error\r\n"}
+{"return": {"human-readable-text": "read 512/512 bytes at offset 0\n512 bytes,
X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}}
+{"return": {"human-readable-text": "wrote 512/512 bytes at offset 0\n512
bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}}
+{"error": {"class": "GenericError", "desc": "read failed: Input/output error"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
QEMU_PROG: Failed to flush the L2 table cache: Input/output error
QEMU_PROG: Failed to flush the refcount block cache: Input/output error
--
2.56.0.rc0.29.g47ce80527c56
