fixup! bios-tables-test: add test for number of cores > 255

Commit Message

Igor Mammedov Nov. 1, 2022, 1:48 p.m. UTC

testcase requires KVM for execution and would fail with
 "
  qemu-system-i386: current -smp configuration requires kernel irqchip
  and X2APIC API support
 "
move it to kvm guarded section.
This fixes CI failure on hosts that doesn't have KVM enabled for Q35
machine type.

Signed-off-by: Igor Mammedov <[e-mail]>
---
 tests/qtest/bios-tables-test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stefan Hajnoczi Nov. 1, 2022, 1:49 p.m. UTC | #1

I will wait for Michael's v2 pull request in the coming days.

Stefan

Patch

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 9d97354df5..395d441212 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1994,8 +1994,6 @@  int main(int argc, char *argv[])
                 qtest_add_func("acpi/q35/tpm12-tis",
                                test_acpi_q35_tcg_tpm12_tis);
             }
-            qtest_add_func("acpi/q35/core-count2",
-                           test_acpi_q35_tcg_core_count2);
             qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
             qtest_add_func("acpi/q35/multif-bridge",
                            test_acpi_q35_multif_bridge);
@@ -2026,6 +2024,8 @@  int main(int argc, char *argv[])
             if (has_kvm) {
                 qtest_add_func("acpi/q35/kvm/xapic", test_acpi_q35_kvm_xapic);
                 qtest_add_func("acpi/q35/kvm/dmar", test_acpi_q35_kvm_dmar);
+                qtest_add_func("acpi/q35/core-count2",
+                               test_acpi_q35_tcg_core_count2);
             }
             qtest_add_func("acpi/q35/viot", test_acpi_q35_viot);
 #ifdef CONFIG_POSIX