Hi Salil, On Mon, Oct 14, 2024 at 08:22:04PM +0100, Salil Mehta wrote: > Date: Mon, 14 Oct 2024 20:22:04 +0100 > From: Salil Mehta <salil.me...@huawei.com> > Subject: [PATCH V1 3/4] hw/acpi: Reflect ACPI vCPU {present,enabled} states > in ACPI _STA.{PRES,ENA} Bits > X-Mailer: git-send-email 2.34.1 > > Reflect the ACPI CPU hotplug `is_{present, enabled}` states in the `_STA.PRES` > (presence) and `_STA.ENA` (enabled) bits when the guest kernel evaluates the > ACPI `_STA` method during initialization, as well as when vCPUs are > hot-plugged > or hot-unplugged. The presence of unplugged vCPUs may need to be deliberately > *simulated* at the ACPI level to maintain a *persistent* view of vCPUs for the > guest kernel. > > Signed-off-by: Salil Mehta <salil.me...@huawei.com> > --- > hw/acpi/cpu.c | 26 ++++++++++++++++++++++---- > 1 file changed, 22 insertions(+), 4 deletions(-) >
It seems this patch changes ACPI table layout and then breaks current ACPI table qtest. I'm not sure how to do such modifications. Maybe you should first disable the related checks, then modify the code, update the qtest, and finally re-enable the checks for qtest. This can help to avoid any qtest failure due to this patch? I think it should get Igor's advice on this. :) Attach the error I met: ▶ 2/920 ERROR:../tests/qtest/bios-tables-test.c:553:test_acpi_asl: assertion failed: (all_tables_match) ERROR ▶ 3/920 ERROR:../tests/qtest/bios-tables-test.c:553:test_acpi_asl: assertion failed: (all_tables_match) ERROR 2/920 qemu:qtest+qtest-i386 / qtest-i386/bios-tables-test ERROR 1.24s killed by signal 6 SIGABRT >>> G_TEST_DBUS_DAEMON=/media/liuzhao/data/qemu-cook/tests/dbus-vmstate-daemon.sh >>> ASAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1 >>> MESON_TEST_ITERATION=1 >>> UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 >>> QTEST_QEMU_BINARY=./qemu-system-i386 MALLOC_PERTURB_=142 >>> MSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 >>> QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon >>> QTEST_QEMU_IMG=./qemu-img >>> PYTHON=/media/liuzhao/data/qemu-cook/build/pyvenv/bin/python3 >>> /media/liuzhao/data/qemu-cook/build/tests/qtest/bios-tables-test --tap -k ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― stderr: acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-VRT5V2], Expected [aml:tests/data/acpi/x86/pc/DSDT]. See source file tests/qtest/bios-tables-test.c for instructions on how to update expected files. acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-TTT5V2.dsl, aml:/tmp/aml-VRT5V2], Expected [asl:/tmp/asl-XXM5V2.dsl, aml:tests/data/acpi/x86/pc/DSDT]. ** ERROR:../tests/qtest/bios-tables-test.c:553:test_acpi_asl: assertion failed: (all_tables_match) (test program exited with status code -6) ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― 3/920 qemu:qtest+qtest-x86_64 / qtest-x86_64/bios-tables-test ERROR 1.25s killed by signal 6 SIGABRT >>> G_TEST_DBUS_DAEMON=/media/liuzhao/data/qemu-cook/tests/dbus-vmstate-daemon.sh >>> ASAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1 >>> MESON_TEST_ITERATION=1 >>> UBSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 >>> >>> MSAN_OPTIONS=halt_on_error=1:abort_on_error=1:print_summary=1:print_stacktrace=1 >>> QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon >>> QTEST_QEMU_IMG=./qemu-img >>> PYTHON=/media/liuzhao/data/qemu-cook/build/pyvenv/bin/python3 >>> MALLOC_PERTURB_=41 QTEST_QEMU_BINARY=./qemu-system-x86_64 >>> /media/liuzhao/data/qemu-cook/build/tests/qtest/bios-tables-test --tap -k ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― stderr: acpi-test: Warning! DSDT binary file mismatch. Actual [aml:/tmp/aml-D5K5V2], Expected [aml:tests/data/acpi/x86/pc/DSDT]. See source file tests/qtest/bios-tables-test.c for instructions on how to update expected files. acpi-test: Warning! DSDT mismatch. Actual [asl:/tmp/asl-G6K5V2.dsl, aml:/tmp/aml-D5K5V2], Expected [asl:/tmp/asl-AQD5V2.dsl, aml:tests/data/acpi/x86/pc/DSDT]. ** ERROR:../tests/qtest/bios-tables-test.c:553:test_acpi_asl: assertion failed: (all_tables_match) (test program exited with status code -6) Regards, Zhao