9803c6ed12
- hw/virtio/virtio-crypto: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/char/virtio-serial-bus: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/display/virtio-gpu: Protect from DMA re-entrancy bugs(CVE-2024-3446) - hw/virtio: Introduce virtio_bh_new_guarded() helper - hw: replace most qemu_bh_new calls with qemu_bh_new_guarded - checkpatch: add qemu_bh_new/aio_bh_new checks - async: avoid use-after-free on re-entrancy guard - async: Add an optional reentrancy guard to the BH API - hw/sd/sdhci: Do not update TRNMOD when Command Inhibit (DAT) is set(CVE-2024-3447) - rtl8139: Remove unused variable - tulip: Remove unused variable - virtio-mem: Fix the bitmap index of the section offset - virtio-mem: Fix the iterator variable in a vmem->rdl_list loop - system/memory: use ldn_he_p/stn_he_p - block: Fix crash when loading snapshot on inactive node - smmu: Clear SMMUPciBus pointer cache when system reset - block/mirror: Fix NULL s->job in active writes - amd_iommu: Fix APIC address check - virtio-crypto: fix NULL pointer dereference in virtio_crypto_free_reques - libqos/virtio.c: Correct 'flags' reading in qvirtqueue_kick cherry-pick from 66e411885a23c96ff73742d06b793fec3ceaebb7 - ivshmem-test.c: enable test_ivshmem_server for ppc64 arch - ivshmem.c: change endianness to LITTLE_ENDIAN - hw/ppc/mac.h: Remove MAX_CPUS macro - configure: remove dead variables - virtio-gpu: do not byteswap padding - hw/intc: clean-up error reporting for failed ITS cmd - qemu-iotests: Discard stderr when probing devices - linux-user: un-parent OBJECT(cpu) when closing thread - hw/net/rocker: Avoid undefined shifts with more than 31 ports - contrib/vhost-user-blk: Clean up deallocation of VuVirtqElement - scsi-disk: fix overflow when block size is not a multiple of BDRV_SECTOR_SIZE Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit bf54b48c2963c869dfdc89977c57be4bd9e772aa)
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From ae868555000f3f9a37df2faf2551825381a86b45 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 25 Mar 2024 10:07:25 +0000
|
|
Subject: [PATCH] qemu-iotests: Discard stderr when probing devices
|
|
mainline inclusion
|
|
commit e13fe274bfbc4c5b338854a3519a64b84c2d5517
|
|
category: bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
qemu-iotests fails in the following setup:
|
|
|
|
./configure --enable-modules --enable-smartcard \
|
|
--target-list=x86_64-softmmu,s390x-softmmu
|
|
make
|
|
cd build
|
|
QEMU_PROG=`pwd`/s390x-softmmu/qemu-system-s390x \
|
|
../tests/check-block.sh qcow2
|
|
...
|
|
--- /home/crobinso/src/qemu/tests/qemu-iotests/127.out
|
|
+++ /home/crobinso/src/qemu/build/tests/qemu-iotests/scratch/127.out.bad
|
|
//@@ -1,4 +1,18 @@
|
|
QA output created by 127
|
|
+Failed to open module: /home/crobinso/src/qemu/build/hw-usb-smartcard.so: undefined symbol: ccid_card_ccid_attach
|
|
...
|
|
--- /home/crobinso/src/qemu/tests/qemu-iotests/267.out
|
|
+++ /home/crobinso/src/qemu/build/tests/qemu-iotests/scratch/267.out.bad
|
|
//@@ -1,4 +1,11 @@
|
|
QA output created by 267
|
|
+Failed to open module: /home/crobinso/src/qemu/build/hw-usb-smartcard.so: undefined symbol: ccid_card_ccid_attach
|
|
|
|
The stderr spew is its own known issue, but seems like iotests should
|
|
be discarding stderr in this case.
|
|
|
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
tests/qemu-iotests/common.rc | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
|
|
index d8582454de..4c468675d3 100644
|
|
--- a/tests/qemu-iotests/common.rc
|
|
+++ b/tests/qemu-iotests/common.rc
|
|
@@ -973,7 +973,7 @@ _require_large_file()
|
|
#
|
|
_require_devices()
|
|
{
|
|
- available=$($QEMU -M none -device help | \
|
|
+ available=$($QEMU -M none -device help 2> /dev/null | \
|
|
grep ^name | sed -e 's/^name "//' -e 's/".*$//')
|
|
for device
|
|
do
|
|
@@ -985,7 +985,7 @@ _require_devices()
|
|
|
|
_require_one_device_of()
|
|
{
|
|
- available=$($QEMU -M none -device help | \
|
|
+ available=$($QEMU -M none -device help 2> /dev/null | \
|
|
grep ^name | sed -e 's/^name "//' -e 's/".*$//')
|
|
for device
|
|
do
|
|
--
|
|
2.27.0
|
|
|