Signed-off-by: Marc-André Lureau <[email protected]>
---
tests/qemu-iotests/249 | 19 +++++++++----------
tests/qemu-iotests/249.out | 18 +++++++++---------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
index 1254bf942913..fb3a4c480a78 100755
--- a/tests/qemu-iotests/249
+++ b/tests/qemu-iotests/249
@@ -45,7 +45,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file fuse
_supported_os Linux
-_require_hmp
IMG_SIZE=1M
@@ -68,9 +67,9 @@ echo
echo '=== Send a write command to a drive opened in read-only mode (1)'
echo
_send_qemu_cmd $QEMU_HANDLE \
- "{ 'execute': 'human-monitor-command',
- 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
- 'return'
+ "{ 'execute': 'x-qemu-io',
+ 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}" \
+ 'error'
echo
echo '=== Run block-commit on base using an invalid filter node name'
@@ -85,9 +84,9 @@ echo
echo '=== Send a write command to a drive opened in read-only mode (2)'
echo
_send_qemu_cmd $QEMU_HANDLE \
- "{ 'execute': 'human-monitor-command',
- 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
- 'return'
+ "{ 'execute': 'x-qemu-io',
+ 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}" \
+ 'error'
echo
echo '=== Run block-commit on base using the default filter node name'
@@ -105,9 +104,9 @@ echo
echo '=== Send a write command to a drive opened in read-only mode (3)'
echo
_send_qemu_cmd $QEMU_HANDLE \
- "{ 'execute': 'human-monitor-command',
- 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
- 'return'
+ "{ 'execute': 'x-qemu-io',
+ 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}" \
+ 'error'
_cleanup_qemu
diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out
index 3d37709a9ef8..79f69cd26513 100644
--- a/tests/qemu-iotests/249.out
+++ b/tests/qemu-iotests/249.out
@@ -7,9 +7,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
backing_file=TEST_DIR/t.
=== Send a write command to a drive opened in read-only mode (1)
-{ 'execute': 'human-monitor-command',
- 'arguments': {'command-line': 'qemu-io none0 "aio_write 0 2k"'}}
-{"return": "Error: Block node is read-onlyrn"}
+{ 'execute': 'x-qemu-io',
+ 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}
+{"error": {"class": "GenericError", "desc": "Block node is read-only"}}
=== Run block-commit on base using an invalid filter node name
@@ -22,9 +22,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
backing_file=TEST_DIR/t.
=== Send a write command to a drive opened in read-only mode (2)
-{ 'execute': 'human-monitor-command',
- 'arguments': {'command-line': 'qemu-io none0 "aio_write 0 2k"'}}
-{"return": "Error: Block node is read-onlyrn"}
+{ 'execute': 'x-qemu-io',
+ 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}
+{"error": {"class": "GenericError", "desc": "Block node is read-only"}}
=== Run block-commit on base using the default filter node name
@@ -41,7 +41,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
backing_file=TEST_DIR/t.
=== Send a write command to a drive opened in read-only mode (3)
-{ 'execute': 'human-monitor-command',
- 'arguments': {'command-line': 'qemu-io none0 "aio_write 0 2k"'}}
-{"return": "Error: Block node is read-onlyrn"}
+{ 'execute': 'x-qemu-io',
+ 'arguments': {'device': 'none0', 'command': 'aio_write 0 2k'}}
+{"error": {"class": "GenericError", "desc": "Block node is read-only"}}
*** done
--
2.56.0.rc0.29.g47ce80527c56
