7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - hw/net/can/sja1000: fix bug for single acceptance filter and standard frame - tests/avocado: fix typo in replay_linux - util/userfaultfd: Remove unused uffd_poll_events - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
From c4d618ea0dc507084d9c1e2b61e58691a73c2cf4 Mon Sep 17 00:00:00 2001
|
|
From: Susanooo <zhangchujun_yewu@cmss.chinamobile.com>
|
|
Date: Thu, 24 Oct 2024 10:10:34 +0800
|
|
Subject: [PATCH] tests: Wait for migration completion on destination QEMU to
|
|
avoid failures
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Rather than waiting for the completion of migration on the source side,
|
|
wait for it on the destination QEMU side to avoid accessing the TPM TIS
|
|
memory mapped registers before QEMU could restore their state. This
|
|
error condition could be triggered on busy systems where the destination
|
|
QEMU did not have enough time to restore the TIS state while the test case
|
|
was already reading its registers. The test case was for example reading
|
|
the STS register and received an unexpected value (0xffffffff), whic
|
|
lead to a segmentation fault later on due to trying to read 0xffff bytes
|
|
from the TIS into a buffer.
|
|
|
|
Cc: <qemu-stable@nongnu.org>
|
|
Reported-by: Fabiano Rosas <farosas@suse.de>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
Signed-off-by: zhangchujun <zhangchujun_yewu@cmss.chinamobile.com>
|
|
---
|
|
tests/qtest/tpm-tests.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/qtest/tpm-tests.c b/tests/qtest/tpm-tests.c
|
|
index fb94496bbd..197714f8d9 100644
|
|
--- a/tests/qtest/tpm-tests.c
|
|
+++ b/tests/qtest/tpm-tests.c
|
|
@@ -114,7 +114,7 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path,
|
|
sizeof(tpm_pcrread_resp));
|
|
|
|
tpm_util_migrate(src_qemu, uri);
|
|
- tpm_util_wait_for_migration_complete(src_qemu);
|
|
+ tpm_util_wait_for_migration_complete(dst_qemu);
|
|
|
|
tpm_util_pcrread(dst_qemu, tx, tpm_pcrread_resp,
|
|
sizeof(tpm_pcrread_resp));
|
|
--
|
|
2.41.0.windows.1
|
|
|