Signed-off-by: Marc-André Lureau <[email protected]>
---
tests/qemu-iotests/081 | 11 ++++++-----
tests/qemu-iotests/081.out | 8 ++------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index d9e729f674c6..f8bf9232bb58 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -44,7 +44,6 @@ _supported_proto file
_supported_os Linux
_require_drivers quorum
_require_devices virtio-scsi
-_require_hmp
do_run_qemu()
{
@@ -138,9 +137,10 @@ run_qemu <<EOF
]
}
}
-{ "execute": "human-monitor-command",
+{ "execute": "x-qemu-io",
"arguments": {
- "command-line": 'qemu-io drive0-quorum "read -P 0x32 0 $size"'
+ "device": "drive0-quorum",
+ "command": "read -P 0x32 0 $size"
}
}
{ "execute": "quit" }
@@ -200,9 +200,10 @@ run_qemu \
<<EOF
{ "execute": "qmp_capabilities" }
{
- "execute": "human-monitor-command",
+ "execute": "x-qemu-io",
"arguments": {
- "command-line": 'qemu-io -d quorum-drive "read -P 0x32 0 $size"'
+ "qdev": "quorum-drive",
+ "command": "read -P 0x32 0 $size"
}
}
{ "execute": "quit" }
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
index 084b6fbff66a..30a1c67af03c 100644
--- a/tests/qemu-iotests/081.out
+++ b/tests/qemu-iotests/081.out
@@ -32,9 +32,7 @@ QMP_VERSION
{"return": {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"QUORUM_REPORT_BAD", "data": {"node-name": "drive2", "sectors-count": 20480,
"sector-num": 0, "type": "read"}}
-read 10485760/10485760 bytes at offset 0
-10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-{"return": ""}
+{"return": {"human-readable-text": "read 10485760/10485760 bytes at offset
0\n10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
{"return": {}}
@@ -64,9 +62,7 @@ Testing: -blockdev
file,node-name=file1,filename=TEST_DIR/1.IMGFMT -blockdev fil
QMP_VERSION
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"QUORUM_REPORT_BAD", "data": {"node-name": "file2", "sectors-count": 20480,
"sector-num": 0, "type": "read"}}
-read 10485760/10485760 bytes at offset 0
-10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-{"return": ""}
+{"return": {"human-readable-text": "read 10485760/10485760 bytes at offset
0\n10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n"}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
{"return": {}}
--
2.56.0.rc0.29.g47ce80527c56
