2019-10-15 22:37:05 +02:00
|
|
|
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
|
2019-11-27 13:46:32 +01:00
|
|
|
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.
|
2019-10-15 22:37:05 +02:00
|
|
|
|
|
|
|
|
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 ++++
|
2019-11-27 13:46:32 +01:00
|
|
|
4 files changed, 14 insertions(+), 4 deletions(-)
|
2019-10-15 22:37:05 +02:00
|
|
|
|
|
|
|
|
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
|
2020-08-12 00:53:07 +02:00
|
|
|
index a7b365701c490b4b4894eb0c26a8..02cb0f8216a6618b5e0dc526c361 100755
|
2019-10-15 22:37:05 +02:00
|
|
|
--- a/tests/qemu-iotests/130
|
|
|
|
|
+++ b/tests/qemu-iotests/130
|
2020-08-12 00:53:07 +02:00
|
|
|
@@ -63,7 +63,8 @@ echo
|
2019-10-15 22:37:05 +02:00
|
|
|
_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
|
2020-08-12 00:53:07 +02:00
|
|
|
@@ -72,7 +73,8 @@ _make_test_img -F raw -b "$TEST_IMG.orig" 64M
|
2019-10-15 22:37:05 +02:00
|
|
|
_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
|
2020-08-12 00:53:07 +02:00
|
|
|
index 34045ea3cfeb5e30acac17ae8a10..b5cec71dd9a718055d9264e51946 100755
|
2019-10-15 22:37:05 +02:00
|
|
|
--- a/tests/qemu-iotests/153
|
|
|
|
|
+++ b/tests/qemu-iotests/153
|
2020-08-12 00:53:07 +02:00
|
|
|
@@ -201,7 +201,8 @@ _send_qemu_cmd $QEMU_HANDLE \
|
2019-10-15 22:37:05 +02:00
|
|
|
'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
|
|
|
|
|
|
2020-08-12 00:53:07 +02:00
|
|
|
@@ -253,7 +254,8 @@ _send_qemu_cmd $QEMU_HANDLE \
|
2019-10-15 22:37:05 +02:00
|
|
|
|
|
|
|
|
_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
|
Accepting request 854151 from home:bfrogers:branches:Virtualization
- Update to v5.2.0: See http://wiki.qemu.org/ChangeLog/5.2
Take note that ongoing feature deprecation is tracked at both
http://wiki.qemu-project.org/Features/LegacyRemoval and in
the deprecated.html file installed with the qemu package
Some noteworthy changes:
* Dropped system emulators: qemu-system-lm32, qemu-system-unicore32
* Dropped linux user emulator: qemu-ppc64abi32
* Added linux user emulator: qemu-extensaeb
* Unicore32 and lm32 guest support dropped
* New sub-packages (most due to ongoing modularization of QEMU):
qemu-audio-spice, qemu-hw-chardev-spice, qemu-hw-display-virtio-vga,
qemu-hw-display-virtio-gpu, qemu-hw-display-virtio-gpu-pci,
qemu-ui-spice-core, qemu-ui-opengl, qemu-ivshmem-tools
* x86: A new KVM feature which improves the handling of asynchronous page
faults is available with -cpu ...,kvm-async-pf-int (requires Linux 5.8)
* s390: More instructions emulated under TCG
* PowerPC: nvdimm= machine option now functions correctly; misc improvements
* ARM: new boards: mps2-an386 (Cortex-M4 based) and mps2-an500
(Cortex-M7 based), raspi3ap (the Pi 3 model A+), raspi0 (the Pi Zero)
and raspi1ap (the Pi A+)
* RISC-V: OpenSBI v0.8 included by default; Generic OpenSBI platform used
when no -bios argument is supplied; Support for NUMA sockets on Virt
and Spike Machines; Support for migrating machines; misc improvements
* Misc NVMe improvements
* The 'vhost-user-blk' export type has been added, allowing
qemu-storage-daemon to act as a vhost-user-blk device backend
* The SMBIOS OEM strings can now come from a file
* 9pfs - misc performance related improvements
* virtiofs - misc improvements
* migration: The default migration bandwidth has been increased to 1Gbps
(users are still encouraged to tune it to their own hardware); The new
'calc-dirty-rate' and 'query-dirty-rate' QMP commands can help determine
the likelihood of precopy migration success; TLS+multifd now supported
for higher bandwidth encrypted migration; misc minor features added
* Misc minor block features added
* Misc doc improvements
* qemu-microvm subpackage change: the bios-microvm.bin is now SeaBIOS based,
and the qboot based on is now qboot.rom
* elf2dmp is no longer part of qemu-tools (it was never intended to be
a packaged binary)
* Some subpackages which were 'Requires' are now 'Recommends', allowing for
a smaller qemu packaging footprint if needed
* Patches dropped (included in release tarball, unless otherwise noted):
docs-fix-trace-docs-build-with-sphinx-3..patch (fixed differently)
hw-hyperv-vmbus-Fix-32bit-compilation.patch
linux-user-properly-test-for-infinite-ti.patch
Switch-order-of-libraries-for-mpath-supp.patch (fixed differently)
Conditionalize-ui-bitmap-installation-be.patch (fixed differently)
hw-usb-hcd-xhci-Fix-GCC-9-build-warning.patch (no longer using gcc9)
hw-usb-dev-mtp-Fix-GCC-9-build-warning.patch (no longer using gcc9)
roms-Makefile-enable-cross-compile-for-b.patch (fixed with different patch)
libvhost-user-handle-endianness-as-manda.patch
virtio-add-vhost-user-fs-ccw-device.patch
Fix-s-directive-argument-is-null-error.patch
build-Workaround-compilation-error-with-.patch
build-Be-explicit-about-fcommon-compiler.patch
intel-Avoid-spurious-compiler-warning-on.patch
golan-Add-explicit-type-casts-for-nodnic.patch
Do-not-apply-WORKAROUND_CFLAGS-for-host-.patch
ensure-headers-included-are-compatible-w.patch
Enable-cross-compile-prefix-for-C-compil.patch (fixed differently)
hw-net-net_tx_pkt-fix-assertion-failure-.patch
hw-net-xgmac-Fix-buffer-overflow-in-xgma.patch
s390x-protvirt-allow-to-IPL-secure-guest.patch
usb-fix-setup_len-init-CVE-2020-14364.patch
* Patches added:
meson-install-ivshmem-client-and-ivshmem.patch
Revert-roms-efirom-tests-uefi-test-tools.patch
Makefile-Don-t-check-pc-bios-as-pre-requ.patch
roms-Makefile-add-cross-file-to-qboot-me.patch
qboot-add-cross.ini-file-to-handle-aarch.patch
usb-Help-compiler-out-to-avoid-a-warning.patch
- In spec file, where reasonable, switch BuildRequires: XXX-devel
to be pkgconfig(XXX') instead
- No longer disable link time optimization for qemu for x86. It looks like
either the build service, qemu code changes and/or the switch to meson
have resolved issues previously seen there. We still see problems for
other architectures however.
- For the record, the following issues reported for SUSE SLE15-SP2
are either fixed in this current package, or are otherwise no longer
an issue: bsc#1172384 bsc#1174386 bsc#1174641 bsc#1174863 bsc#1175370
bsc#1175441 bsc#1176494 CVE-2020-13361 CVE-2020-14364 CVE-2020-15863
CVE-2020-16092 CVE-2020-24352
and the following feature requests are satisfied by this package:
jsc#SLE-13689 jsc#SEL-13780 jsc#SLE-13840
- To be more accurate, and to align with other qemu packaging
practices, rename the qemu-s390 package to qemu-s390x. The old
name (in the rpm namespace) is provided with a "Provides"
directive, and an "Obsoletes" done against that name for prior
qemu versions, as is standard practice (boo#1177764 jsc#SLE-17060)
- Take this opportunity to remove some ancient Split-Provides
mechanisms which can't conceivably be needed any more:
qemu-block-curl provided: qemu:%_libdir/%name/block-curl.so
qemu-guest-agent provided: qemu:%_bindir/qemu-ga
qemu-tools provided: qemu:%_libexecdir/qemu-bridge-helper
- Disable linux-user 'ls' test on 32 bit arm. It's failing with
"Allocating guest commpage: Cannot allocate memory" error, which
we should hunt down, but for now we don't want it to prevent the
package from being built
OBS-URL: https://build.opensuse.org/request/show/854151
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=597
2020-12-08 23:01:20 +01:00
|
|
|
index fcaa71aeeebd855d684d8056410f..8fbc7413e716462a4f196c39db5e 100644
|
2019-10-15 22:37:05 +02:00
|
|
|
--- a/tests/qemu-iotests/153.out
|
|
|
|
|
+++ b/tests/qemu-iotests/153.out
|
2020-08-12 00:53:07 +02:00
|
|
|
@@ -424,6 +424,8 @@ Is another process using the image [TEST_DIR/t.qcow2]?
|
2019-10-15 22:37:05 +02:00
|
|
|
_qemu_img_wrapper commit -b TEST_DIR/t.qcow2.b TEST_DIR/t.qcow2.c
|
2019-11-27 13:46:32 +01:00
|
|
|
{ 'execute': 'qmp_capabilities' }
|
2019-10-15 22:37:05 +02:00
|
|
|
{"return": {}}
|
|
|
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
|
|
|
|
|
+{"return": {}}
|
|
|
|
|
Adding drive
|
2019-11-27 13:46:32 +01:00
|
|
|
{ 'execute': 'human-monitor-command', 'arguments': { 'command-line': 'drive_add 0 if=none,id=d0,file=TEST_DIR/t.IMGFMT' } }
|
2019-10-15 22:37:05 +02:00
|
|
|
{"return": "OKrn"}
|
2020-08-12 00:53:07 +02:00
|
|
|
@@ -457,6 +459,8 @@ Closing the other
|
2019-10-15 22:37:05 +02:00
|
|
|
{"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 ==
|
|
|
|
|
|