Re: [PATCH v2 24/25] tests/qtest/bios-tables-test: Keep ACPI PCI hotplug off

[Igor Mammedov <imammedo@redhat.com>]

On Wed, 11 Jun 2025 10:14:55 -0300
Gustavo Romero <gustavo.romero@linaro.org> wrote:

> Hi Igor,
> 
> On 6/11/25 05:54, Igor Mammedov wrote:
> > On Tue, 10 Jun 2025 11:29:02 -0300
> > Gustavo Romero <gustavo.romero@linaro.org> wrote:
[...]
> 
> 
> BTW, why did we ultimately choose to commit blobs instead of the actual ACPI
> code (as generated by iasl)? I'm just wondering if we could avoid committing
> the blobs to 1) avoid committing binaries and 2) have the changes in the
> ACPI code in the same commit that changes the ACPI itself.
> 
> If that's only for historical reasons maybe I can improve the bios-tables-test.c
> to handle the ACPI code/struct in text format, avoiding the blobs, so I ask.


We've had this for binary blobs at the beginning, however iasl output was
a moving target (whether it's ASL or AML) hence it proved to be unsuitable
for testing infrastructure (and not only testing, I don't remember concrete bugs though).

As result, we've switched to custom AML generator (aml_foo() API) with
blobs it has generated. ASL output by IASL in tests is used by maintaners
for diagnostic (/documenting) purposes only.

> Thanks!
> 
> 
> Cheers,
> Gustavo
> 
> >>
> >>
> >> Thanks,
> >> Gustavo
> >>      
> >>>
> >>> Cheers,
> >>> Gustavo
> >>>      
> >>>>     
> >>>>> Cheers,
> >>>>> Gustavo
> >>>>>     
> >>>>>>> https://mail.gnu.org/archive/html/qemu-devel/2025-05/msg05828.html 4/5
> >>>>>>> https://mail.gnu.org/archive/html/qemu-devel/2025-05/msg05827.html 5/5
> >>>>>>>
> >>>>>>>
> >>>>>>> Cheers,
> >>>>>>> Gustavo  
> >>>>>>>>>
> >>>>>>>>> ---
> >>>>>>>>>
> >>>>>>>>> [Eric] also added acpi-pcihp=off to test_acpi_aarch64_virt_tcg_numamem
> >>>>>>>>> ---
> >>>>>>>>>      tests/qtest/bios-tables-test.c | 13 +++++++++----
> >>>>>>>>>      1 file changed, 9 insertions(+), 4 deletions(-)
> >>>>>>>>>
> >>>>>>>>> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> >>>>>>>>> index 0a333ec435..6379dba714 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"
> >>>>>>>>> @@ -1747,7 +1747,8 @@ static void test_acpi_aarch64_virt_tcg_numamem(void)
> >>>>>>>>>          };
> >>>>>>>>>          data.variant = ".numamem";
> >>>>>>>>> -    test_acpi_one(" -cpu cortex-a57"
> >>>>>>>>> +    test_acpi_one(" -machine acpi-pcihp=off"
> >>>>>>>>> +                  " -cpu cortex-a57"
> >>>>>>>>>                        " -object memory-backend-ram,id=ram0,size=128M"
> >>>>>>>>>                        " -numa node,memdev=ram0",
> >>>>>>>>>                        &data);
> >>>>>>>>> @@ -1775,7 +1776,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 +1848,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 +2125,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 +2145,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 +2231,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);
> >>>>>>>>>      }  
> >>>>>     
> >>>>     
> >>>      
> >>  
> >   
>