ba97ec0138
Update to v5.1.0 qemu OBS-URL: https://build.opensuse.org/request/show/825860 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=557
108 lines
4.0 KiB
Diff
108 lines
4.0 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Tue, 15 Oct 2019 11:16:14 -0600
|
|
Subject: tests: Fix block tests to be compatible with membarrier configuration
|
|
|
|
The use of membarriers collides with the block test's practice of
|
|
SIGKILLing test vm's. Have them quit politely. Tests: 130, 153 - and
|
|
though test 161 seems to have the same issue, it is not yet fixed, but
|
|
just marked here as possibly needing a fix.
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
tests/qemu-iotests/130 | 6 ++++--
|
|
tests/qemu-iotests/130.out | 2 ++
|
|
tests/qemu-iotests/153 | 6 ++++--
|
|
tests/qemu-iotests/153.out | 4 ++++
|
|
4 files changed, 14 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
|
|
index a7b365701c490b4b4894eb0c26a8..02cb0f8216a6618b5e0dc526c361 100755
|
|
--- a/tests/qemu-iotests/130
|
|
+++ b/tests/qemu-iotests/130
|
|
@@ -63,7 +63,8 @@ echo
|
|
_launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base"
|
|
_send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)"
|
|
_send_qemu_cmd $QEMU_HANDLE '' '(qemu)'
|
|
-_cleanup_qemu
|
|
+_send_qemu_cmd $QEMU_HANDLE 'quit' ''
|
|
+wait=1 _cleanup_qemu
|
|
_img_info | _filter_img_info
|
|
|
|
# Make sure that if there was a backing file that was just overridden on the
|
|
@@ -72,7 +73,8 @@ _make_test_img -F raw -b "$TEST_IMG.orig" 64M
|
|
_launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base",backing.driver=$IMGFMT
|
|
_send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)"
|
|
_send_qemu_cmd $QEMU_HANDLE '' '(qemu)'
|
|
-_cleanup_qemu
|
|
+_send_qemu_cmd $QEMU_HANDLE 'quit' ''
|
|
+wait=1 _cleanup_qemu
|
|
_img_info | _filter_img_info
|
|
|
|
echo
|
|
diff --git a/tests/qemu-iotests/130.out b/tests/qemu-iotests/130.out
|
|
index e45285ccc311522481ac1b27ba99..7168bdf70c3eb32d4de0d28bb947 100644
|
|
--- a/tests/qemu-iotests/130.out
|
|
+++ b/tests/qemu-iotests/130.out
|
|
@@ -11,6 +11,7 @@ virtual size: 64 MiB (67108864 bytes)
|
|
QEMU X.Y.Z monitor - type 'help' for more information
|
|
(qemu) commit testdisk
|
|
(qemu)
|
|
+(qemu) quit
|
|
image: TEST_DIR/t.IMGFMT
|
|
file format: IMGFMT
|
|
virtual size: 64 MiB (67108864 bytes)
|
|
@@ -18,6 +19,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t
|
|
QEMU X.Y.Z monitor - type 'help' for more information
|
|
(qemu) commit testdisk
|
|
(qemu)
|
|
+(qemu) quit
|
|
image: TEST_DIR/t.IMGFMT
|
|
file format: IMGFMT
|
|
virtual size: 64 MiB (67108864 bytes)
|
|
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
|
|
index 34045ea3cfeb5e30acac17ae8a10..b5cec71dd9a718055d9264e51946 100755
|
|
--- a/tests/qemu-iotests/153
|
|
+++ b/tests/qemu-iotests/153
|
|
@@ -201,7 +201,8 @@ _send_qemu_cmd $QEMU_HANDLE \
|
|
'return'
|
|
_run_cmd $QEMU_IMG commit -b "${TEST_IMG}.b" "${TEST_IMG}.c"
|
|
|
|
-_cleanup_qemu
|
|
+_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" ''
|
|
+wait=1 _cleanup_qemu
|
|
|
|
_launch_qemu
|
|
|
|
@@ -253,7 +254,8 @@ _send_qemu_cmd $QEMU_HANDLE \
|
|
|
|
_run_cmd $QEMU_IO "${TEST_IMG}" -c 'write 0 512'
|
|
|
|
-_cleanup_qemu
|
|
+_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'quit' }" ''
|
|
+wait=1 _cleanup_qemu
|
|
|
|
echo
|
|
echo "== Detecting -U and force-share conflicts =="
|
|
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
|
|
index 8a79e1ee870d72c6d346898113b1..d1d6b673b22d5443700ae9c146c7 100644
|
|
--- a/tests/qemu-iotests/153.out
|
|
+++ b/tests/qemu-iotests/153.out
|
|
@@ -424,6 +424,8 @@ Is another process using the image [TEST_DIR/t.qcow2]?
|
|
_qemu_img_wrapper commit -b TEST_DIR/t.qcow2.b TEST_DIR/t.qcow2.c
|
|
{ 'execute': 'qmp_capabilities' }
|
|
{"return": {}}
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
|
|
+{"return": {}}
|
|
Adding drive
|
|
{ 'execute': 'human-monitor-command', 'arguments': { 'command-line': 'drive_add 0 if=none,id=d0,file=TEST_DIR/t.IMGFMT' } }
|
|
{"return": "OKrn"}
|
|
@@ -457,6 +459,8 @@ Closing the other
|
|
{"return": ""}
|
|
|
|
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
|
|
+{"return": {}}
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
|
|
|
|
== Detecting -U and force-share conflicts ==
|
|
|