Signed-off-by: Marc-André Lureau <[email protected]>
---
tests/qemu-iotests/091 | 45 +++++++++++++++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index 626203d6fc93..d777f94e00e9 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -48,7 +48,6 @@ _supported_fmt qcow2
_supported_proto file fuse
_supported_os Linux
_supported_cache_modes writethrough none writeback
-_require_hmp
_default_cache_mode none writeback
size=1G
@@ -61,7 +60,6 @@ echo
echo === Starting QEMU VM1 ===
echo
-qemu_comm_method="monitor"
_launch_qemu -drive
file="${TEST_IMG}",cache=${CACHEMODE},aio=${AIOMODE},id=disk
h1=$QEMU_HANDLE
@@ -77,26 +75,53 @@ echo === VM 1: Migrate from VM1 to VM2 ===
echo
silent=yes
-_send_qemu_cmd $h1 'qemu-io disk "write -P 0x22 0 4M"' "(qemu)"
+_send_qemu_cmd $h1 \
+ "{ 'execute': 'qmp_capabilities' }" \
+ 'return'
+_send_qemu_cmd $h2 \
+ "{ 'execute': 'qmp_capabilities' }" \
+ 'return'
+
+_send_qemu_cmd $h1 \
+ "{ 'execute': 'x-qemu-io',
+ 'arguments': { 'device': 'disk', 'command': 'write -P 0x22 0 4M' } }" \
+ 'return'
echo "vm1: qemu-io disk write complete"
-_send_qemu_cmd $h1 "migrate \"exec: cat > '${MIG_FIFO}'\"" "(qemu)"
+_send_qemu_cmd $h1 \
+ "{ 'execute': 'migrate',
+ 'arguments': { 'uri': 'exec:cat > ${MIG_FIFO}' } }" \
+ 'return'
echo "vm1: live migration started"
-qemu_cmd_repeat=20 _send_qemu_cmd $h1 "info migrate" "completed"
+qemu_cmd_repeat=20 _send_qemu_cmd $h1 \
+ "{ 'execute': 'query-migrate' }" \
+ '"status": "completed"'
echo "vm1: live migration completed"
echo
echo === VM 2: Post-migration, write to disk, verify running ===
echo
-_send_qemu_cmd $h2 'qemu-io disk "write 4M 1M"' "(qemu)"
+_send_qemu_cmd $h2 \
+ "{ 'execute': 'x-qemu-io',
+ 'arguments': { 'device': 'disk', 'command': 'write 4M 1M' } }" \
+ 'return'
echo "vm2: qemu-io disk write complete"
-qemu_cmd_repeat=20 _send_qemu_cmd $h2 "info status" "running"
+qemu_cmd_repeat=20 _send_qemu_cmd $h2 \
+ "{ 'execute': 'query-status' }" \
+ '"status": "running"'
echo "vm2: qemu process running successfully"
echo "vm2: flush io, and quit"
-_send_qemu_cmd $h2 'qemu-io disk flush' "(qemu)"
-_send_qemu_cmd $h2 'quit' ""
-_send_qemu_cmd $h1 'quit' ""
+_send_qemu_cmd $h2 \
+ "{ 'execute': 'x-qemu-io',
+ 'arguments': { 'device': 'disk', 'command': 'flush' } }" \
+ 'return'
+_send_qemu_cmd $h2 \
+ "{ 'execute': 'quit' }" \
+ 'return'
+_send_qemu_cmd $h1 \
+ "{ 'execute': 'quit' }" \
+ 'return'
wait=yes _cleanup_qemu >/dev/null
--
2.56.0.rc0.29.g47ce80527c56
