Re: [PATCH 2/5] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off

[Gustavo Romero]

Hi Eric,

On 5/26/25 10:23, Eric Auger wrote:

Hi Gustavo,

On 5/26/25 7:31 AM, Gustavo Romero wrote:

ACPI PCI hotplug is now turned on by default so we need to change the
existing tests to keep it off. However, even setting the ACPI PCI
hotplug off in the existing tests, there will be changes in the ACPI
tables because the _OSC method was modified, hence in the next patch of
this series the blobs are updated accordingly.

Signed-off-by: Gustavo Romero <gustavo.rom...@linaro.org>
---
  tests/qtest/bios-tables-test.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 0a333ec435..216941dbb5 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1626,7 +1626,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)
      };

data.variant = ".memhp";

-    test_acpi_one(" -machine nvdimm=on"
+    test_acpi_one(" -machine nvdimm=on,acpi-pcihp=off"
                    " -cpu cortex-a57"
                    " -m 256M,slots=3,maxmem=1G"
                    " -object memory-backend-ram,id=ram0,size=128M"
@@ -1775,7 +1775,8 @@ static void test_acpi_aarch64_virt_tcg_pxb(void)
       * to solve the conflicts.
       */
      data.variant = ".pxb";
-    test_acpi_one(" -device pcie-root-port,chassis=1,id=pci.1"
+    test_acpi_one(" -machine acpi-pcihp=off"
+                  " -device pcie-root-port,chassis=1,id=pci.1"
                    " -device virtio-scsi-pci,id=scsi0,bus=pci.1"
                    " -drive file="
                    
"tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2,"
@@ -1846,7 +1847,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)

data.variant = ".acpihmatvirt"; - test_acpi_one(" -machine hmat=on"

+    test_acpi_one(" -machine hmat=on,acpi-pcihp=off"
                    " -cpu cortex-a57"
                    " -smp 4,sockets=2"
                    " -m 384M"
@@ -2123,6 +2124,7 @@ static void test_acpi_aarch64_virt_tcg(void)
      data.smbios_cpu_max_speed = 2900;
      data.smbios_cpu_curr_speed = 2700;
      test_acpi_one("-cpu cortex-a57 "
+                  "-machine acpi-pcihp=off "
                    "-smbios type=4,max-speed=2900,current-speed=2700", &data);
      free_test_data(&data);
  }
@@ -2142,6 +2144,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void)
      };

test_acpi_one("-cpu cortex-a57 "

+                  "-machine acpi-pcihp=off "
                    "-smp sockets=1,clusters=2,cores=2,threads=2", &data);
      free_test_data(&data);
  }
@@ -2227,6 +2230,7 @@ static void test_acpi_aarch64_virt_viot(void)
      };

test_acpi_one("-cpu cortex-a57 "

+                  "-machine acpi-pcihp=off "
                    "-device virtio-iommu-pci", &data);
      free_test_data(&data);

I think this is also meaningful that this gets inserted in the ACPI PCI
hotplug series before it acpi pci hp becomes the new default (of course
if you agree on that)

Yeah! I've indeed just mentioned it when replying to you in 3/5 :)


Cheers,
Gustavo

Cheers

Eric

  }