Add support for RISC-V ACPI tests
Subsystems (2)
v3 cover Add support for RISC-V ACPI tests
Currently, bios-table-test doesn't support RISC-V. This series enables the framework changes required and basic testing. Things like NUMA related test cases will be added later.
This needs refactoring/renaming of ARM64 and x86 bios table tests. Importantly, the test cases now look for the expected AML files under tests/data/acpi/${arch}/${machine} path instead of directly under tests/data/acpi/${machine}. To keep test cases not to fail because of this movement, they are updated to look for both paths first.
As part of this effort, it is found that uefi-test-tools is currently broken to build. So, updated its Makefile as well to use python based edk2 build script.
The changes are also available at branch
https://gitlab.com/vlsunil/qemu/-/tree/riscv_bios_table_test_v3
Changes since v2:
1) Used ${arch}/${machine} path instead of {machine}/${arch} as per the feedback.
2) Updated x86 AML files and test cases as well to use new path.
3) Used data->cd for RISC-V test which internally uses -cdrom option. This needs a fix in RISC-V virt machine [1]. So, the patch [1] is a dependency for this series.
3) Updated tags.
Changes since v1:
1) Addressed feedback from Gerd and Alistair
2) Rebased and added tags received
[1]: https://mail.gnu.org/archive/html/qemu-devel/2024-06/msg03683.html
Sunil V L (15):
uefi-test-tools/UefiTestToolsPkg: Add RISC-V support
uefi-test-tools: Add support for python based build script tests/data/uefi-boot-images: Add RISC-V ISO image
qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them tests/qtest/bios-tables-test.c: Add support for arch in path tests/qtest/bios-tables-test.c: Set "arch" for aarch64 tests tests/qtest/bios-tables-test.c: Set "arch" for x86 tests tests/data/acpi: Move x86 ACPI tables under x86/${machine} path tests/data/acpi/virt: Move ARM64 ACPI tables under aarch64/${machine}
path
meson.build: Add RISC-V to the edk2-target list pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V
meson.build | 2 +-
pc-bios/meson.build | 2 +
tests/data/acpi/{ => aarch64}/virt/APIC | Bin
.../acpi/{ => aarch64}/virt/APIC.acpihmatvirt | Bin
.../acpi/{ => aarch64}/virt/APIC.topology | Bin
tests/data/acpi/{ => aarch64}/virt/DBG2 | Bin
tests/data/acpi/{ => aarch64}/virt/DSDT | Bin
.../acpi/{ => aarch64}/virt/DSDT.acpihmatvirt | Bin
tests/data/acpi/{ => aarch64}/virt/DSDT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/DSDT.pxb | Bin
.../acpi/{ => aarch64}/virt/DSDT.topology | Bin
tests/data/acpi/{ => aarch64}/virt/FACP | Bin
tests/data/acpi/{ => aarch64}/virt/GTDT | Bin
.../acpi/{ => aarch64}/virt/HMAT.acpihmatvirt | Bin
tests/data/acpi/{ => aarch64}/virt/IORT | Bin
tests/data/acpi/{ => aarch64}/virt/MCFG | Bin
tests/data/acpi/{ => aarch64}/virt/NFIT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/PPTT | Bin
.../acpi/{ => aarch64}/virt/PPTT.acpihmatvirt | Bin
.../acpi/{ => aarch64}/virt/PPTT.topology | Bin
.../data/acpi/{pc => aarch64/virt}/SLIT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/SPCR | Bin
.../acpi/{ => aarch64}/virt/SRAT.acpihmatvirt | Bin
tests/data/acpi/{ => aarch64}/virt/SRAT.memhp | Bin
.../data/acpi/{ => aarch64}/virt/SRAT.numamem | Bin
tests/data/acpi/{ => aarch64}/virt/SSDT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/VIOT | Bin
tests/data/acpi/rebuild-expected-aml.sh | 5 +-
tests/data/acpi/riscv64/virt/APIC | Bin 0 -> 116 bytes
.../{microvm/DSDT.pcie => riscv64/virt/DSDT} | Bin 3023 -> 3518 bytes
tests/data/acpi/riscv64/virt/FACP | Bin 0 -> 276 bytes
tests/data/acpi/riscv64/virt/MCFG | Bin 0 -> 60 bytes
tests/data/acpi/riscv64/virt/RHCT | Bin 0 -> 314 bytes
tests/data/acpi/riscv64/virt/SPCR | Bin 0 -> 80 bytes
tests/data/acpi/{ => x86}/microvm/APIC | Bin
.../data/acpi/{ => x86}/microvm/APIC.ioapic2 | Bin
tests/data/acpi/{ => x86}/microvm/APIC.pcie | Bin
tests/data/acpi/{ => x86}/microvm/DSDT | Bin
.../data/acpi/{ => x86}/microvm/DSDT.ioapic2 | Bin
tests/data/acpi/{ => x86}/microvm/DSDT.pcie | Bin
tests/data/acpi/{ => x86}/microvm/DSDT.rtc | Bin
tests/data/acpi/{ => x86}/microvm/DSDT.usb | Bin
tests/data/acpi/{ => x86}/microvm/ERST.pcie | Bin
tests/data/acpi/{ => x86}/microvm/FACP | Bin
tests/data/acpi/{ => x86}/pc/APIC | Bin
tests/data/acpi/{ => x86}/pc/APIC.acpihmat | Bin
tests/data/acpi/{ => x86}/pc/APIC.cphp | Bin
tests/data/acpi/{ => x86}/pc/APIC.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/DSDT | Bin
tests/data/acpi/{ => x86}/pc/DSDT.acpierst | Bin
tests/data/acpi/{ => x86}/pc/DSDT.acpihmat | Bin
tests/data/acpi/{ => x86}/pc/DSDT.bridge | Bin
tests/data/acpi/{ => x86}/pc/DSDT.cphp | Bin
tests/data/acpi/{ => x86}/pc/DSDT.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/DSDT.hpbridge | Bin
tests/data/acpi/{ => x86}/pc/DSDT.hpbrroot | Bin
tests/data/acpi/{ => x86}/pc/DSDT.ipmikcs | Bin
tests/data/acpi/{ => x86}/pc/DSDT.memhp | Bin
tests/data/acpi/{ => x86}/pc/DSDT.nohpet | Bin
tests/data/acpi/{ => x86}/pc/DSDT.numamem | Bin
tests/data/acpi/{ => x86}/pc/DSDT.roothp | Bin
tests/data/acpi/{ => x86}/pc/ERST.acpierst | Bin
tests/data/acpi/{ => x86}/pc/FACP | Bin
tests/data/acpi/{ => x86}/pc/FACP.nosmm | Bin
tests/data/acpi/{ => x86}/pc/FACS | Bin
tests/data/acpi/{ => x86}/pc/HMAT.acpihmat | Bin
tests/data/acpi/{ => x86}/pc/HPET | Bin
tests/data/acpi/{ => x86}/pc/NFIT.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/SLIT.cphp | Bin
tests/data/acpi/{q35 => x86/pc}/SLIT.memhp | Bin
tests/data/acpi/{ => x86}/pc/SRAT.acpihmat | Bin
tests/data/acpi/{ => x86}/pc/SRAT.cphp | Bin
tests/data/acpi/{ => x86}/pc/SRAT.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/SRAT.memhp | Bin
tests/data/acpi/{ => x86}/pc/SRAT.numamem | Bin
tests/data/acpi/{ => x86}/pc/SSDT.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/WAET | Bin
tests/data/acpi/{ => x86}/q35/APIC | Bin
tests/data/acpi/{ => x86}/q35/APIC.acpihmat | Bin
.../{ => x86}/q35/APIC.acpihmat-noinitiator | Bin
tests/data/acpi/{ => x86}/q35/APIC.core-count | Bin
.../data/acpi/{ => x86}/q35/APIC.core-count2 | Bin
tests/data/acpi/{ => x86}/q35/APIC.cphp | Bin
tests/data/acpi/{ => x86}/q35/APIC.dimmpxm | Bin
.../data/acpi/{ => x86}/q35/APIC.thread-count | Bin
.../acpi/{ => x86}/q35/APIC.thread-count2 | Bin
.../data/acpi/{ => x86}/q35/APIC.type4-count | Bin
tests/data/acpi/{ => x86}/q35/APIC.xapic | Bin
tests/data/acpi/{ => x86}/q35/CEDT.cxl | Bin
tests/data/acpi/{ => x86}/q35/DMAR.dmar | Bin
tests/data/acpi/{ => x86}/q35/DSDT | Bin
tests/data/acpi/{ => x86}/q35/DSDT.acpierst | Bin
tests/data/acpi/{ => x86}/q35/DSDT.acpihmat | Bin
.../{ => x86}/q35/DSDT.acpihmat-noinitiator | Bin
tests/data/acpi/{ => x86}/q35/DSDT.applesmc | Bin
tests/data/acpi/{ => x86}/q35/DSDT.bridge | Bin
tests/data/acpi/{ => x86}/q35/DSDT.core-count | Bin
.../data/acpi/{ => x86}/q35/DSDT.core-count2 | Bin
tests/data/acpi/{ => x86}/q35/DSDT.cphp | Bin
tests/data/acpi/{ => x86}/q35/DSDT.cxl | Bin
tests/data/acpi/{ => x86}/q35/DSDT.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/DSDT.ipmibt | Bin
tests/data/acpi/{ => x86}/q35/DSDT.ipmismbus | Bin
tests/data/acpi/{ => x86}/q35/DSDT.ivrs | Bin
tests/data/acpi/{ => x86}/q35/DSDT.memhp | Bin
tests/data/acpi/{ => x86}/q35/DSDT.mmio64 | Bin
.../data/acpi/{ => x86}/q35/DSDT.multi-bridge | Bin
tests/data/acpi/{ => x86}/q35/DSDT.noacpihp | Bin
tests/data/acpi/{ => x86}/q35/DSDT.nohpet | Bin
tests/data/acpi/{ => x86}/q35/DSDT.numamem | Bin
.../data/acpi/{ => x86}/q35/DSDT.pvpanic-isa | Bin
.../data/acpi/{ => x86}/q35/DSDT.thread-count | Bin
.../acpi/{ => x86}/q35/DSDT.thread-count2 | Bin
tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm12 | Bin
tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm2 | Bin
.../data/acpi/{ => x86}/q35/DSDT.type4-count | Bin
tests/data/acpi/{ => x86}/q35/DSDT.viot | Bin
tests/data/acpi/{ => x86}/q35/DSDT.xapic | Bin
tests/data/acpi/{ => x86}/q35/ERST.acpierst | Bin
tests/data/acpi/{ => x86}/q35/FACP | Bin
tests/data/acpi/{ => x86}/q35/FACP.core-count | Bin
.../data/acpi/{ => x86}/q35/FACP.core-count2 | Bin
tests/data/acpi/{ => x86}/q35/FACP.nosmm | Bin
tests/data/acpi/{ => x86}/q35/FACP.slic | Bin
.../data/acpi/{ => x86}/q35/FACP.thread-count | Bin
.../acpi/{ => x86}/q35/FACP.thread-count2 | Bin
.../data/acpi/{ => x86}/q35/FACP.type4-count | Bin
tests/data/acpi/{ => x86}/q35/FACP.xapic | Bin
tests/data/acpi/{ => x86}/q35/FACS | Bin
tests/data/acpi/{ => x86}/q35/HMAT.acpihmat | Bin
.../{ => x86}/q35/HMAT.acpihmat-noinitiator | Bin
tests/data/acpi/{ => x86}/q35/HPET | Bin
tests/data/acpi/{ => x86}/q35/IVRS.ivrs | Bin
tests/data/acpi/{ => x86}/q35/MCFG | Bin
tests/data/acpi/{ => x86}/q35/NFIT.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/SLIC.slic | Bin
tests/data/acpi/{ => x86}/q35/SLIT.cphp | Bin
tests/data/acpi/{virt => x86/q35}/SLIT.memhp | Bin
tests/data/acpi/{ => x86}/q35/SRAT.acpihmat | Bin
.../{ => x86}/q35/SRAT.acpihmat-noinitiator | Bin
tests/data/acpi/{ => x86}/q35/SRAT.cphp | Bin
tests/data/acpi/{ => x86}/q35/SRAT.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/SRAT.memhp | Bin
tests/data/acpi/{ => x86}/q35/SRAT.mmio64 | Bin
tests/data/acpi/{ => x86}/q35/SRAT.numamem | Bin
tests/data/acpi/{ => x86}/q35/SRAT.xapic | Bin
tests/data/acpi/{ => x86}/q35/SSDT.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/TCPA.tis.tpm12 | Bin
tests/data/acpi/{ => x86}/q35/TPM2.tis.tpm2 | Bin
tests/data/acpi/{ => x86}/q35/VIOT.viot | Bin
tests/data/acpi/{ => x86}/q35/WAET | Bin
.../bios-tables-test.riscv64.iso.qcow2 | Bin 0 -> 16896 bytes
tests/qtest/bios-tables-test.c | 169 ++++++++++++++----
tests/qtest/meson.build | 3 +
tests/uefi-test-tools/Makefile | 19 +-
.../UefiTestToolsPkg/UefiTestToolsPkg.dsc | 6 +-
tests/uefi-test-tools/uefi-test-build.config | 52 ++++++
157 files changed, 210 insertions(+), 48 deletions(-)
rename tests/data/acpi/{ => aarch64}/virt/APIC (100%)
rename tests/data/acpi/{ => aarch64}/virt/APIC.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/APIC.topology (100%)
rename tests/data/acpi/{ => aarch64}/virt/DBG2 (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT.pxb (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT.topology (100%)
rename tests/data/acpi/{ => aarch64}/virt/FACP (100%)
rename tests/data/acpi/{ => aarch64}/virt/GTDT (100%)
rename tests/data/acpi/{ => aarch64}/virt/HMAT.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/IORT (100%)
rename tests/data/acpi/{ => aarch64}/virt/MCFG (100%)
rename tests/data/acpi/{ => aarch64}/virt/NFIT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/PPTT (100%)
rename tests/data/acpi/{ => aarch64}/virt/PPTT.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/PPTT.topology (100%)
rename tests/data/acpi/{pc => aarch64/virt}/SLIT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/SPCR (100%)
rename tests/data/acpi/{ => aarch64}/virt/SRAT.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/SRAT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/SRAT.numamem (100%)
rename tests/data/acpi/{ => aarch64}/virt/SSDT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/VIOT (100%)
create mode 100644 tests/data/acpi/riscv64/virt/APIC
copy tests/data/acpi/{microvm/DSDT.pcie => riscv64/virt/DSDT} (62%)
create mode 100644 tests/data/acpi/riscv64/virt/FACP
create mode 100644 tests/data/acpi/riscv64/virt/MCFG
create mode 100644 tests/data/acpi/riscv64/virt/RHCT
create mode 100644 tests/data/acpi/riscv64/virt/SPCR
rename tests/data/acpi/{ => x86}/microvm/APIC (100%)
rename tests/data/acpi/{ => x86}/microvm/APIC.ioapic2 (100%)
rename tests/data/acpi/{ => x86}/microvm/APIC.pcie (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT.ioapic2 (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT.pcie (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT.rtc (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT.usb (100%)
rename tests/data/acpi/{ => x86}/microvm/ERST.pcie (100%)
rename tests/data/acpi/{ => x86}/microvm/FACP (100%)
rename tests/data/acpi/{ => x86}/pc/APIC (100%)
rename tests/data/acpi/{ => x86}/pc/APIC.acpihmat (100%)
rename tests/data/acpi/{ => x86}/pc/APIC.cphp (100%)
rename tests/data/acpi/{ => x86}/pc/APIC.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.acpierst (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.bridge (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.cphp (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.hpbridge (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.hpbrroot (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.ipmikcs (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.memhp (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.nohpet (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.numamem (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.roothp (100%)
rename tests/data/acpi/{ => x86}/pc/ERST.acpierst (100%)
rename tests/data/acpi/{ => x86}/pc/FACP (100%)
rename tests/data/acpi/{ => x86}/pc/FACP.nosmm (100%)
rename tests/data/acpi/{ => x86}/pc/FACS (100%)
rename tests/data/acpi/{ => x86}/pc/HMAT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/pc/HPET (100%)
rename tests/data/acpi/{ => x86}/pc/NFIT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/SLIT.cphp (100%)
rename tests/data/acpi/{q35 => x86/pc}/SLIT.memhp (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.cphp (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.memhp (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.numamem (100%)
rename tests/data/acpi/{ => x86}/pc/SSDT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/WAET (100%)
rename tests/data/acpi/{ => x86}/q35/APIC (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.acpihmat (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.acpihmat-noinitiator (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.core-count (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.core-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.cphp (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.thread-count (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.thread-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.type4-count (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.xapic (100%)
rename tests/data/acpi/{ => x86}/q35/CEDT.cxl (100%)
rename tests/data/acpi/{ => x86}/q35/DMAR.dmar (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.acpierst (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.acpihmat-noinitiator (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.applesmc (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.bridge (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.core-count (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.core-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.cphp (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.cxl (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.ipmibt (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.ipmismbus (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.ivrs (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.memhp (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.mmio64 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.multi-bridge (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.noacpihp (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.nohpet (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.numamem (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.pvpanic-isa (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.thread-count (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.thread-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm12 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm2 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.type4-count (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.viot (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.xapic (100%)
rename tests/data/acpi/{ => x86}/q35/ERST.acpierst (100%)
rename tests/data/acpi/{ => x86}/q35/FACP (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.core-count (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.core-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.nosmm (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.slic (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.thread-count (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.thread-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.type4-count (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.xapic (100%)
rename tests/data/acpi/{ => x86}/q35/FACS (100%)
rename tests/data/acpi/{ => x86}/q35/HMAT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/q35/HMAT.acpihmat-noinitiator (100%)
rename tests/data/acpi/{ => x86}/q35/HPET (100%)
rename tests/data/acpi/{ => x86}/q35/IVRS.ivrs (100%)
rename tests/data/acpi/{ => x86}/q35/MCFG (100%)
rename tests/data/acpi/{ => x86}/q35/NFIT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/SLIC.slic (100%)
rename tests/data/acpi/{ => x86}/q35/SLIT.cphp (100%)
rename tests/data/acpi/{virt => x86/q35}/SLIT.memhp (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.acpihmat-noinitiator (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.cphp (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.memhp (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.mmio64 (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.numamem (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.xapic (100%)
rename tests/data/acpi/{ => x86}/q35/SSDT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/TCPA.tis.tpm12 (100%)
rename tests/data/acpi/{ => x86}/q35/TPM2.tis.tpm2 (100%)
rename tests/data/acpi/{ => x86}/q35/VIOT.viot (100%)
rename tests/data/acpi/{ => x86}/q35/WAET (100%)
create mode 100644 tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2
create mode 100644 tests/uefi-test-tools/uefi-test-build.configSignature · 1 line
2.40.1
PATCH v3 1/15 uefi-test-tools/UefiTestToolsPkg: Add RISC-V support
Enable building the test application for RISC-V with appropriate dependencies updated.
--- tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc +5 -1
@@ -19,7 +19,7 @@ PLATFORM_VERSION = 0.1 PLATFORM_NAME = UefiTestTools SKUID_IDENTIFIER = DEFAULT - SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64 + SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64|RISCV64 BUILD_TARGETS = DEBUG [BuildOptions.IA32]
@@ -60,6 +60,10 @@ [LibraryClasses.IA32, LibraryClasses.X64] BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf + RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf + +[LibraryClasses.RISCV64] + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
Signature · 1 line
2.40.1
Re: [PATCH v3 01/15] uefi-test-tools/UefiTestToolsPkg: Add RISC-V support
Quoted 6 lines · On Fri, 21 Jun 2024 17:28:52 +0530 Sunil V L <[email protected]> wrote:
Enable building the test application for RISC-V with appropriate dependencies updated.
Signed-off-by Sunil V L <[email protected]>Acked-by Gerd Hoffmann <[email protected]>Acked-by Alistair Francis <[email protected]>
Quoted 28 lines
--- tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc +5
-1@@ -19,7 +19,7 @@ PLATFORM_VERSION = 0.1 PLATFORM_NAME = UefiTestTools SKUID_IDENTIFIER = DEFAULT - SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64 + SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64|RISCV64 BUILD_TARGETS = DEBUG [BuildOptions.IA32]@@ -60,6 +60,10 @@ [LibraryClasses.IA32, LibraryClasses.X64] BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf + RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf + +[LibraryClasses.RISCV64] + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf [PcdsFixedAtBuild] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
PATCH v3 2/15 uefi-test-tools: Add support for python based build script
In reply to Sunil V Ledk2-funcs.sh which is used in this Makefile, was removed in the commit c28a2891f3 ("edk2: update build script"). It is replaced with a python based script. So, update the Makefile and add the configuration file as required to support the python based build script.
--- tests/uefi-test-tools/Makefile | 19 +++---- tests/uefi-test-tools/uefi-test-build.config | 52 ++++++++++++++++++++ 2 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 tests/uefi-test-tools/uefi-test-build.config
tests/uefi-test-tools/Makefile +7 -12
@@ -12,7 +12,7 @@ edk2_dir := ../../roms/edk2 images_dir := ../data/uefi-boot-images -emulation_targets := arm aarch64 i386 x86_64 +emulation_targets := arm aarch64 i386 x86_64 riscv64 uefi_binaries := bios-tables-test intermediate_suffixes := .efi .fat .iso.raw
@@ -56,7 +56,8 @@ Build/%.iso.raw: Build/%.fat # stripped from, the argument. map_arm_to_uefi = $(subst arm,ARM,$(1)) map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1))) -map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1))) +map_riscv64_to_uefi = $(subst riscv64,RISCV64,$(call map_aarch64_to_uefi,$(1))) +map_i386_to_uefi = $(subst i386,IA32,$(call map_riscv64_to_uefi,$(1))) map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1))) map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
@@ -70,7 +71,7 @@ Build/%.fat: Build/%.efi uefi_bin_b=$$(stat --format=%s -- $<) && \ uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \ uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \ - mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb + mkdosfs -C $@ -n "bios-test" -- $$uefi_fat_kb MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
@@ -95,15 +96,9 @@ Build/%.fat: Build/%.efi # we must mark the recipe manually as recursive, by using the "+" indicator. # This way, when the inner "make" starts a parallel build of the target edk2 # module, it can communicate with the outer "make"'s job server. -Build/bios-tables-test.%.efi: build-edk2-tools - +./build.sh $(edk2_dir) BiosTablesTest $* $@ - -build-edk2-tools: - cd $(edk2_dir)/BaseTools && git submodule update --init --force - $(MAKE) -C $(edk2_dir)/BaseTools \ - PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \ - EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ - EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)' +Build/bios-tables-test.%.efi: + $(PYTHON) ../../roms/edk2-build.py --config uefi-test-build.config \ + --match $* clean: rm -rf Build Conf log
tests/uefi-test-tools/uefi-test-build.config new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
2.40.1
Re: [PATCH v3 02/15] uefi-test-tools: Add support for python based build script
Quoted 6 lines · Sunil V L
edk2-funcs.shwhich is used in thisMakefile, was removed in the commitc28a2891f3("edk2: update build script"). It is replaced with a python based script. So, update theMakefileand add the configuration file as required to support the python based build script.Signed-off-by Sunil V L <[email protected]>
Re: [PATCH v3 02/15] uefi-test-tools: Add support for python based build script
In reply to Sunil V LQuoted 6 lines · On Fri, 21 Jun 2024 17:28:53 +0530 Sunil V L <[email protected]> wrote:
edk2-funcs.shwhich is used in thisMakefile, was removed in the commitc28a2891f3("edk2: update build script"). It is replaced with a python based script. So, update theMakefileand add the configuration file as required to support the python based build script.Signed-off-by Sunil V L <[email protected]>
Quoted 115 lines
--- tests/uefi-test-tools/Makefile | 19 +++---- tests/uefi-test-tools/uefi-test-build.config | 52 ++++++++++++++++++++ 2 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 tests/uefi-test-tools/uefi-test-build.configtests/uefi-test-tools/Makefile +7
-12@@ -12,7 +12,7 @@ edk2_dir := ../../roms/edk2 images_dir := ../data/uefi-boot-images -emulation_targets := arm aarch64 i386 x86_64 +emulation_targets := arm aarch64 i386 x86_64 riscv64 uefi_binaries := bios-tables-test intermediate_suffixes := .efi .fat .iso.raw@@ -56,7 +56,8 @@ Build/%.iso.raw: Build/%.fat # stripped from, the argument. map_arm_to_uefi = $(subst arm,ARM,$(1)) map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1))) -map_i386_to_uefi = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1))) +map_riscv64_to_uefi = $(subst riscv64,RISCV64,$(call map_aarch64_to_uefi,$(1))) +map_i386_to_uefi = $(subst i386,IA32,$(call map_riscv64_to_uefi,$(1))) map_x86_64_to_uefi = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1))) map_to_uefi = $(subst .,,$(call map_x86_64_to_uefi,$(1)))@@ -70,7 +71,7 @@ Build/%.fat: Build/%.efi uefi_bin_b=$$(stat --format=%s -- $<) && \ uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \ uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \ - mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb + mkdosfs -C $@ -n "bios-test" -- $$uefi_fat_kb MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \@@ -95,15 +96,9 @@ Build/%.fat: Build/%.efi # we must mark the recipe manually as recursive, by using the "+" indicator. # This way, when the inner "make" starts a parallel build of the target edk2 # module, it can communicate with the outer "make"'s job server. -Build/bios-tables-test.%.efi: build-edk2-tools - +./build.sh $(edk2_dir) BiosTablesTest $* $@ - -build-edk2-tools: - cd $(edk2_dir)/BaseTools && git submodule update --init --force - $(MAKE) -C $(edk2_dir)/BaseTools \ - PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \ - EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \ - EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)' +Build/bios-tables-test.%.efi: + $(PYTHON) ../../roms/edk2-build.py --config uefi-test-build.config \ + --match $* clean: rm -rf Build Conf logtests/uefi-test-tools/uefi-test-build.config new file +52
-0@@ -0,0 +1,52 @@ +[global] +core = ../../roms/edk2 + +#################################################################################### +# arm + +[build.arm] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +dest = ./Build +arch = ARM +cpy1 = ARM/BiosTablesTest.efi bios-tables-test.arm.efi + +#################################################################################### +# aarch64 + +[build.aarch64] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +dest = ./Build +arch = AARCH64 +cpy1 = AARCH64/BiosTablesTest.efi bios-tables-test.aarch64.efi + +#################################################################################### +# riscv64 + +[build.riscv] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +dest = ./Build +arch = RISCV64 +cpy1 = RISCV64/BiosTablesTest.efi bios-tables-test.riscv64.efi + +#################################################################################### +# ia32 + +[build.ia32] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +dest = ./Build +arch = IA32 +cpy1 = IA32/BiosTablesTest.efi bios-tables-test.i386.efi + +#################################################################################### +# x64 + +[build.x64] +conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc +plat = UefiTestTools +dest = ./Build +arch = X64 +cpy1 = X64/BiosTablesTest.efi bios-tables-test.x86_64.efi
PATCH v3 3/15 tests/data/uefi-boot-images: Add RISC-V ISO image
In reply to Sunil V LTo test ACPI tables, edk2 needs to be booted with a disk image having EFI partition. This image is created using UefiTestToolsPkg.
The image is generated using tests/uefi-test-tools source.
--- .../bios-tables-test.riscv64.iso.qcow2 | Bin 0 -> 16896 bytes tests/uefi-test-tools/uefi-test-build.config | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2
tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2 new file binary +0 -0
tests/uefi-test-tools/uefi-test-build.config +1 -1
@@ -24,7 +24,7 @@ cpy1 = AARCH64/BiosTablesTest.efi bios-tables-test.aarch64.efi #################################################################################### # riscv64 -[build.riscv] +[build.riscv64] conf = UefiTestToolsPkg/UefiTestToolsPkg.dsc plat = UefiTestTools dest = ./Build
Signature · 1 line
2.40.1
PATCH v3 4/15 qtest: bios-tables-test: Rename aarch64 tests with aarch64 in them
In reply to Sunil V LExisting AARCH64 virt test functions do not have AARCH64 in their name. To add RISC-V virt related test cases, better to rename existing functions to indicate they are ARM only.
--- tests/qtest/bios-tables-test.c | 35 ++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-)
tests/qtest/bios-tables-test.c +19 -16
@@ -1570,7 +1570,7 @@ static void test_acpi_piix4_tcg_dimm_pxm(void)test_acpi_tcg_dimm_pxm (MACHINE_PC ); } -static void test_acpi_virt_tcg_memhp (void ) +static void test_acpi_aarch64_virt_tcg_memhp (void ) {test_data data = { .machine ="virt" ,
@@ -1663,7 +1663,7 @@ static void test_acpi_microvm_ioapic2_tcg(void)free_test_data (&data); } -static void test_acpi_virt_tcg_numamem (void ) +static void test_acpi_aarch64_virt_tcg_numamem (void ) {test_data data = { .machine ="virt" ,
@@ -1685,7 +1685,7 @@ static void test_acpi_virt_tcg_numamem(void) } -static void test_acpi_virt_tcg_pxb (void ) +static void test_acpi_aarch64_virt_tcg_pxb (void ) {test_data data = { .machine ="virt" ,
@@ -1758,7 +1758,7 @@ static void test_acpi_piix4_tcg_acpi_hmat(void)test_acpi_tcg_acpi_hmat (MACHINE_PC ); } -static void test_acpi_virt_tcg_acpi_hmat (void ) +static void test_acpi_aarch64_virt_tcg_acpi_hmat (void ) {test_data data = { .machine ="virt" ,
@@ -1914,7 +1914,7 @@ static void test_acpi_microvm_acpi_erst(void) }#endif /* CONFIG_POSIX */ -static void test_acpi_virt_tcg (void ) +static void test_acpi_aarch64_virt_tcg (void ) {test_data data = { .machine ="virt" ,
@@ -1933,7 +1933,7 @@ static void test_acpi_virt_tcg(void)free_test_data (&data); } -static void test_acpi_virt_tcg_topology (void ) +static void test_acpi_aarch64_virt_tcg_topology (void ) {test_data data = { .machine ="virt" ,
@@ -2016,7 +2016,7 @@ static void test_acpi_q35_cxl(void) }#endif /* CONFIG_POSIX */ -static void test_acpi_virt_viot (void ) +static void test_acpi_aarch64_virt_viot (void ) {test_data data = { .machine ="virt" ,
@@ -2192,7 +2192,7 @@ static void test_acpi_microvm_oem_fields(void)g_free (args); } -static void test_acpi_virt_oem_fields (void ) +static void test_acpi_aarch64_virt_oem_fields (void ) {test_data data = { .machine ="virt" ,
@@ -2364,16 +2364,19 @@ int main(int argc, char *argv[]) } }else if (strcmp (arch,"aarch64" ) ==0 ) {if (has_tcg &&qtest_has_device ("virtio-blk-pci" )) { -qtest_add_func ("acpi/virt" , test_acpi_virt_tcg); +qtest_add_func ("acpi/virt" , test_acpi_aarch64_virt_tcg);qtest_add_func ("acpi/virt/acpihmatvirt" , - test_acpi_virt_tcg_acpi_hmat); -qtest_add_func ("acpi/virt/topology" , test_acpi_virt_tcg_topology); -qtest_add_func ("acpi/virt/numamem" , test_acpi_virt_tcg_numamem); -qtest_add_func ("acpi/virt/memhp" , test_acpi_virt_tcg_memhp); -qtest_add_func ("acpi/virt/pxb" , test_acpi_virt_tcg_pxb); -qtest_add_func ("acpi/virt/oem-fields" , test_acpi_virt_oem_fields); + test_acpi_aarch64_virt_tcg_acpi_hmat); +qtest_add_func ("acpi/virt/topology" , + test_acpi_aarch64_virt_tcg_topology); +qtest_add_func ("acpi/virt/numamem" , + test_acpi_aarch64_virt_tcg_numamem); +qtest_add_func ("acpi/virt/memhp" , test_acpi_aarch64_virt_tcg_memhp); +qtest_add_func ("acpi/virt/pxb" , test_acpi_aarch64_virt_tcg_pxb); +qtest_add_func ("acpi/virt/oem-fields" , + test_acpi_aarch64_virt_oem_fields);if (qtest_has_device ("virtio-iommu-pci" )) { -qtest_add_func ("acpi/virt/viot" , test_acpi_virt_viot); +qtest_add_func ("acpi/virt/viot" , test_acpi_aarch64_virt_viot); } } }
Signature · 1 line
2.40.1
PATCH v3 5/15 tests/qtest/bios-tables-test.c: Add support for arch in path
In reply to Sunil V LSince machine name can be common for multiple architectures (ex: virt), add "arch" in the path to search for expected AML files. Since the AML files are still under old path, add support for searching with and without arch in the path.
--- tests/qtest/bios-tables-test.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
tests/qtest/bios-tables-test.c +20 -3
@@ -78,6 +78,7 @@ typedef struct { bool tcg_only; const char *machine; + const char *arch; const char *machine_param; const char *variant; const char *uefi_fl1;
@@ -262,8 +263,19 @@ static void dump_aml_files(test_data *data, bool rebuild)g_assert (exp_sdt->aml);if (rebuild) { - aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, + aml_file =g_strdup_printf ("%s/%s/%s/%.4s%s" , data_dir, + data->arch, data->machine, sdt->aml, ext); + +/* +* To keep test cases not failing before the DATA files are moved to +* ${arch}/${machine} folder, add this check as well. +*/ +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS )) { + aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, + data->machine, sdt->aml, ext); + } +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS ) && sdt->aml_len == exp_sdt->aml_len && !memcmp (sdt->aml, exp_sdt->aml, sdt->aml_len)) {
@@ -398,8 +410,13 @@ static GArray *load_expected_aml(test_data *data)memset (&exp_sdt,0 ,sizeof (exp_sdt)); try_again: - aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, - sdt->aml, ext); + aml_file =g_strdup_printf ("%s/%s/%s/%.4s%s" , data_dir, data->arch, + data->machine, sdt->aml, ext); +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS )) { + aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, + sdt->aml, ext); + } +if (verbosity_level >=2 ) {fprintf (stderr,"Looking for expected file '%s'\n" , aml_file); }
Signature · 1 line
2.40.1
Re: [PATCH v3 05/15] tests/qtest/bios-tables-test.c: Add support for arch in path
Quoted 7 lines · Sunil V L
Since machine name can be common for multiple architectures (ex: virt), add "arch" in the path to search for expected AML files. Since the AML files are still under old path, add support for searching with and without arch in the path.
Signed-off-by Sunil V L <[email protected]>
Alistair
Quoted 56 lines
--- tests/qtest/bios-tables-test.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)tests/qtest/bios-tables-test.c +20
-4@@ -78,6 +78,7 @@ typedef struct { bool tcg_only; const char *machine; + const char *arch; const char *machine_param; const char *variant; const char *uefi_fl1;@@ -262,8 +263,19 @@ static void dump_aml_files(test_data *data, bool rebuild)g_assert (exp_sdt->aml);if (rebuild) { - aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, + aml_file =g_strdup_printf ("%s/%s/%s/%.4s%s" , data_dir, + data->arch, data->machine, sdt->aml, ext); + +/* +* To keep test cases not failing before the DATA files are moved to +* ${arch}/${machine} folder, add this check as well. +*/ +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS )) { + aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, + data->machine, sdt->aml, ext); + } +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS ) && sdt->aml_len == exp_sdt->aml_len && !memcmp (sdt->aml, exp_sdt->aml, sdt->aml_len)) {@@ -398,8 +410,13 @@ static GArray *load_expected_aml(test_data *data)memset (&exp_sdt,0 ,sizeof (exp_sdt)); try_again: - aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, - sdt->aml, ext); + aml_file =g_strdup_printf ("%s/%s/%s/%.4s%s" , data_dir, data->arch, + data->machine, sdt->aml, ext); +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS )) { + aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, + sdt->aml, ext); + } +if (verbosity_level >=2 ) {fprintf (stderr,"Looking for expected file '%s'\n" , aml_file); } --2.40.1
Re: [PATCH v3 05/15] tests/qtest/bios-tables-test.c: Add support for arch in path
In reply to Sunil V LQuoted 6 lines · On Fri, 21 Jun 2024 17:28:56 +0530 Sunil V L <[email protected]> wrote:
Since machine name can be common for multiple architectures (ex: virt), add "arch" in the path to search for expected AML files. Since the AML files are still under old path, add support for searching with and without arch in the path.
Signed-off-by Sunil V L <[email protected]>
Quoted 53 lines
--- tests/qtest/bios-tables-test.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)tests/qtest/bios-tables-test.c +20
-3@@ -78,6 +78,7 @@ typedef struct { bool tcg_only; const char *machine; + const char *arch; const char *machine_param; const char *variant; const char *uefi_fl1;@@ -262,8 +263,19 @@ static void dump_aml_files(test_data *data, bool rebuild)g_assert (exp_sdt->aml);if (rebuild) { - aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, + aml_file =g_strdup_printf ("%s/%s/%s/%.4s%s" , data_dir, + data->arch, data->machine, sdt->aml, ext); + +/* +* To keep test cases not failing before the DATA files are moved to +* ${arch}/${machine} folder, add this check as well. +*/ +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS )) { + aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, + data->machine, sdt->aml, ext); + } +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS ) && sdt->aml_len == exp_sdt->aml_len && !memcmp (sdt->aml, exp_sdt->aml, sdt->aml_len)) {@@ -398,8 +410,13 @@ static GArray *load_expected_aml(test_data *data)memset (&exp_sdt,0 ,sizeof (exp_sdt)); try_again: - aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, - sdt->aml, ext); + aml_file =g_strdup_printf ("%s/%s/%s/%.4s%s" , data_dir, data->arch, + data->machine, sdt->aml, ext); +if (!g_file_test (aml_file,G_FILE_TEST_EXISTS )) { + aml_file =g_strdup_printf ("%s/%s/%.4s%s" , data_dir, data->machine, + sdt->aml, ext); + } +if (verbosity_level >=2 ) {fprintf (stderr,"Looking for expected file '%s'\n" , aml_file); }
PATCH v3 6/15 tests/qtest/bios-tables-test.c: Set "arch" for aarch64 tests
In reply to Sunil V LTo search for expected AML files under ${arch}/${machine} path, set this field for AARCH64 related test cases.
--- tests/qtest/bios-tables-test.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tests/qtest/bios-tables-test.c +8 -0
@@ -1591,6 +1591,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
@@ -1684,6 +1685,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
@@ -1706,6 +1708,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
@@ -1779,6 +1782,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
@@ -1935,6 +1939,7 @@ static void test_acpi_aarch64_virt_tcg(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
@@ -1954,6 +1959,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .variant =".topology" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" ,
@@ -2037,6 +2043,7 @@ static void test_acpi_aarch64_virt_viot(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
@@ -2213,6 +2220,7 @@ static void test_acpi_aarch64_virt_oem_fields(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
Signature · 1 line
2.40.1
Re: [PATCH v3 06/15] tests/qtest/bios-tables-test.c: Set "arch" for aarch64 tests
Quoted 5 lines · Sunil V L
To search for expected AML files under ${arch}/${machine} path, set this field for AARCH64 related test cases.
Signed-off-by Sunil V L <[email protected]>
Alistair
Quoted 75 lines
--- tests/qtest/bios-tables-test.c | 8 ++++++++ 1 file changed, 8 insertions(+)tests/qtest/bios-tables-test.c +8
-1@@ -1591,6 +1591,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1684,6 +1685,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1706,6 +1708,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1779,6 +1782,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1935,6 +1939,7 @@ static void test_acpi_aarch64_virt_tcg(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1954,6 +1959,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .variant =".topology" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" ,@@ -2037,6 +2043,7 @@ static void test_acpi_aarch64_virt_viot(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -2213,6 +2220,7 @@ static void test_acpi_aarch64_virt_oem_fields(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" , --2.40.1
Re: [PATCH v3 06/15] tests/qtest/bios-tables-test.c: Set "arch" for aarch64 tests
In reply to Sunil V LQuoted 4 lines · On Fri, 21 Jun 2024 17:28:57 +0530 Sunil V L <[email protected]> wrote:
To search for expected AML files under ${arch}/${machine} path, set this field for AARCH64 related test cases.
Signed-off-by Sunil V L <[email protected]>
Quoted 72 lines
--- tests/qtest/bios-tables-test.c | 8 ++++++++ 1 file changed, 8 insertions(+)tests/qtest/bios-tables-test.c +8
-0@@ -1591,6 +1591,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1684,6 +1685,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1706,6 +1708,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1779,6 +1782,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1935,6 +1939,7 @@ static void test_acpi_aarch64_virt_tcg(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -1954,6 +1959,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .variant =".topology" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" ,@@ -2037,6 +2043,7 @@ static void test_acpi_aarch64_virt_viot(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,@@ -2213,6 +2220,7 @@ static void test_acpi_aarch64_virt_oem_fields(void) {test_data data = { .machine ="virt" , + .arch ="aarch64" , .tcg_only = true, .uefi_fl1 ="pc-bios/edk2-aarch64-code.fd" , .uefi_fl2 ="pc-bios/edk2-arm-vars.fd" ,
PATCH v3 7/15 tests/qtest/bios-tables-test.c: Set "arch" for x86 tests
In reply to Sunil V LTo search for expected AML files under ${arch}/${machine} path, set this field for X86 related test cases.
--- tests/qtest/bios-tables-test.c | 77 ++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 13 deletions(-)
tests/qtest/bios-tables-test.c +64 -13
@@ -933,6 +933,7 @@ static void test_acpi_piix4_tcg(void)* This is to make guest actually run. */ data.machine =MACHINE_PC ; + data.arch ="x86" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);test_acpi_one (NULL , &data);
@@ -944,6 +945,7 @@ static void test_acpi_piix4_tcg_bridge(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".bridge" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
@@ -981,6 +983,7 @@ static void test_acpi_piix4_no_root_hotplug(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".roothp" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
@@ -997,6 +1000,7 @@ static void test_acpi_piix4_no_bridge_hotplug(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".hpbridge" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
@@ -1013,6 +1017,7 @@ static void test_acpi_piix4_no_acpi_pci_hotplug(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".hpbrroot" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
@@ -1034,6 +1039,7 @@ static void test_acpi_q35_tcg(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);test_acpi_one (NULL , &data);
@@ -1049,6 +1055,7 @@ static void test_acpi_q35_kvm_type4_count(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".type4-count" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),
@@ -1065,6 +1072,7 @@ static void test_acpi_q35_kvm_core_count(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".core-count" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),
@@ -1082,6 +1090,7 @@ static void test_acpi_q35_kvm_core_count2(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".core-count2" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),
@@ -1099,6 +1108,7 @@ static void test_acpi_q35_kvm_thread_count(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".thread-count" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),
@@ -1116,6 +1126,7 @@ static void test_acpi_q35_kvm_thread_count2(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".thread-count2" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),
@@ -1134,6 +1145,7 @@ static void test_acpi_q35_tcg_bridge(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".bridge" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
@@ -1148,6 +1160,7 @@ static void test_acpi_q35_tcg_no_acpi_hotplug(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".noacpihp" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
@@ -1176,6 +1189,7 @@ static void test_acpi_q35_multif_bridge(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".multi-bridge" , }; test_vm_prepare("-S"
@@ -1225,6 +1239,7 @@ static void test_acpi_q35_tcg_mmio64(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".mmio64" , .tcg_only = true, .required_struct_types = base_required_struct_types,
@@ -1245,6 +1260,7 @@ static void test_acpi_piix4_tcg_cphp(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".cphp" ;test_acpi_one ("-smp 2,cores=3,sockets=2,maxcpus=6" " -object memory-backend-ram,id=ram0,size=64M"
@@ -1260,6 +1276,7 @@ static void test_acpi_q35_tcg_cphp(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".cphp" ;test_acpi_one (" -smp 2,cores=3,sockets=2,maxcpus=6" " -object memory-backend-ram,id=ram0,size=64M"
@@ -1279,6 +1296,7 @@ static void test_acpi_q35_tcg_ipmi(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".ipmibt" ; data.required_struct_types = ipmi_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (ipmi_required_struct_types);
@@ -1293,6 +1311,7 @@ static void test_acpi_q35_tcg_smbus_ipmi(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".ipmismbus" ; data.required_struct_types = ipmi_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (ipmi_required_struct_types);
@@ -1310,6 +1329,7 @@ static void test_acpi_piix4_tcg_ipmi(void)* This is to make guest actually run. */ data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".ipmikcs" ; data.required_struct_types = ipmi_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (ipmi_required_struct_types);
@@ -1324,6 +1344,7 @@ static void test_acpi_q35_tcg_memhp(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".memhp" ;test_acpi_one (" -m 128,slots=3,maxmem=1G" " -object memory-backend-ram,id=ram0,size=64M"
@@ -1339,6 +1360,7 @@ static void test_acpi_piix4_tcg_memhp(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".memhp" ;test_acpi_one (" -m 128,slots=3,maxmem=1G" " -object memory-backend-ram,id=ram0,size=64M"
@@ -1354,6 +1376,7 @@ static void test_acpi_piix4_tcg_nosmm(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".nosmm" ;test_acpi_one ("-machine smm=off" , &data);free_test_data (&data);
@@ -1364,6 +1387,7 @@ static void test_acpi_piix4_tcg_smm_compat(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".smm-compat" ;test_acpi_one ("-global PIIX4_PM.smm-compat=on" , &data);free_test_data (&data);
@@ -1374,6 +1398,7 @@ static void test_acpi_piix4_tcg_smm_compat_nosmm(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".smm-compat-nosmm" ;test_acpi_one ("-global PIIX4_PM.smm-compat=on -machine smm=off" , &data);free_test_data (&data);
@@ -1384,6 +1409,7 @@ static void test_acpi_piix4_tcg_nohpet(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.machine_param =",hpet=off" ; data.variant =".nohpet" ;test_acpi_one (NULL , &data);
@@ -1395,6 +1421,7 @@ static void test_acpi_q35_tcg_numamem(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".numamem" ;test_acpi_one (" -object memory-backend-ram,id=ram0,size=128M" " -numa node -numa node,memdev=ram0" , &data);
@@ -1406,6 +1433,7 @@ static void test_acpi_q35_kvm_xapic(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".xapic" ;test_acpi_one (" -object memory-backend-ram,id=ram0,size=128M" " -numa node -numa node,memdev=ram0"
@@ -1418,6 +1446,7 @@ static void test_acpi_q35_tcg_nosmm(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".nosmm" ;test_acpi_one ("-machine smm=off" , &data);free_test_data (&data);
@@ -1428,6 +1457,7 @@ static void test_acpi_q35_tcg_smm_compat(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".smm-compat" ;test_acpi_one ("-global ICH9-LPC.smm-compat=on" , &data);free_test_data (&data);
@@ -1438,6 +1468,7 @@ static void test_acpi_q35_tcg_smm_compat_nosmm(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".smm-compat-nosmm" ;test_acpi_one ("-global ICH9-LPC.smm-compat=on -machine smm=off" , &data);free_test_data (&data);
@@ -1448,6 +1479,7 @@ static void test_acpi_q35_tcg_nohpet(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.machine_param =",hpet=off" ; data.variant =".nohpet" ;test_acpi_one (NULL , &data);
@@ -1459,6 +1491,7 @@ static void test_acpi_q35_kvm_dmar(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".dmar" ;test_acpi_one ("-machine kernel-irqchip=split -accel kvm" " -device intel-iommu,intremap=on,device-iotlb=on" , &data);
@@ -1470,6 +1503,7 @@ static void test_acpi_q35_tcg_ivrs(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".ivrs" ; data.tcg_only = true,test_acpi_one (" -device amd-iommu" , &data);
@@ -1481,6 +1515,7 @@ static void test_acpi_piix4_tcg_numamem(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".numamem" ;test_acpi_one (" -object memory-backend-ram,id=ram0,size=128M" " -numa node -numa node,memdev=ram0" , &data);
@@ -1489,8 +1524,9 @@ static void test_acpi_piix4_tcg_numamem(void)uint64_t tpm_tis_base_addr; -static void test_acpi_tcg_tpm (const char *machine,const char *tpm_if, -uint64_t base,enum TPMVersion tpm_version) +static void test_acpi_tcg_tpm (const char *machine,const char *arch, +const char *tpm_if,uint64_t base, +enum TPMVersion tpm_version) {gchar *tmp_dir_name =g_strdup_printf ("qemu-test_acpi_%s_tcg_%s.XXXXXX" , machine, tpm_if);
@@ -1517,6 +1553,7 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,tpm_emu_test_wait_cond (&test); data.machine = machine; + data.arch = arch; data.variant = variant; args = g_strdup_printf(
@@ -1540,19 +1577,20 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,static void test_acpi_q35_tcg_tpm2_tis (void ) { -test_acpi_tcg_tpm ("q35" ,"tis" ,0xFED40000 ,TPM_VERSION_2_0 ); +test_acpi_tcg_tpm ("q35" ,"x86" ,"tis" ,0xFED40000 ,TPM_VERSION_2_0 ); }static void test_acpi_q35_tcg_tpm12_tis (void ) { -test_acpi_tcg_tpm ("q35" ,"tis" ,0xFED40000 ,TPM_VERSION_1_2 ); +test_acpi_tcg_tpm ("q35" ,"x86" ,"tis" ,0xFED40000 ,TPM_VERSION_1_2 ); } -static void test_acpi_tcg_dimm_pxm (const char *machine) +static void test_acpi_tcg_dimm_pxm (const char *machine,const char *arch) {test_data data = {}; data.machine = machine; + data.arch = arch; data.variant =".dimmpxm" ;test_acpi_one (" -machine nvdimm=on,nvdimm-persistence=cpu" " -smp 4,sockets=4"
@@ -1579,12 +1617,12 @@ static void test_acpi_tcg_dimm_pxm(const char *machine)static void test_acpi_q35_tcg_dimm_pxm (void ) { -test_acpi_tcg_dimm_pxm (MACHINE_Q35 ); +test_acpi_tcg_dimm_pxm (MACHINE_Q35 ,"x86" ); }static void test_acpi_piix4_tcg_dimm_pxm (void ) { -test_acpi_tcg_dimm_pxm (MACHINE_PC ); +test_acpi_tcg_dimm_pxm (MACHINE_PC ,"x86" ); }static void test_acpi_aarch64_virt_tcg_memhp (void )
@@ -1621,6 +1659,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)static void test_acpi_microvm_prepare (test_data *data) { data->machine ="microvm" ; + data->arch ="x86" ; data->required_struct_types =NULL ;/* no smbios */ data->required_struct_types_len =0 ; data->blkdev ="virtio-blk-device" ;
@@ -1737,11 +1776,12 @@ static void test_acpi_aarch64_virt_tcg_pxb(void)free_test_data (&data); } -static void test_acpi_tcg_acpi_hmat (const char *machine) +static void test_acpi_tcg_acpi_hmat (const char *machine,const char *arch) {test_data data = {}; data.machine = machine; + data.arch = arch; data.variant =".acpihmat" ;test_acpi_one (" -machine hmat=on" " -smp 2,sockets=2"
@@ -1770,12 +1810,12 @@ static void test_acpi_tcg_acpi_hmat(const char *machine)static void test_acpi_q35_tcg_acpi_hmat (void ) { -test_acpi_tcg_acpi_hmat (MACHINE_Q35 ); +test_acpi_tcg_acpi_hmat (MACHINE_Q35 ,"x86" ); }static void test_acpi_piix4_tcg_acpi_hmat (void ) { -test_acpi_tcg_acpi_hmat (MACHINE_PC ); +test_acpi_tcg_acpi_hmat (MACHINE_PC ,"x86" ); }static void test_acpi_aarch64_virt_tcg_acpi_hmat (void )
@@ -1841,6 +1881,7 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" ; data.variant =".acpihmat-noinitiator" ;test_acpi_one (" -machine hmat=on" " -smp 4,sockets=2"
@@ -1884,13 +1925,14 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void) }#ifdef CONFIG_POSIX -static void test_acpi_erst (const char *machine) +static void test_acpi_erst (const char *machine,const char *arch) {gchar *tmp_path =g_dir_make_tmp ("qemu-test-erst.XXXXXX" ,NULL );gchar *params;test_data data = {}; data.machine = machine; + data.arch = arch; data.variant =".acpierst" ; params =g_strdup_printf ( " -object memory-backend-file,id=erstnvram,"
@@ -1905,12 +1947,12 @@ static void test_acpi_erst(const char *machine)static void test_acpi_piix4_acpi_erst (void ) { -test_acpi_erst (MACHINE_PC ); +test_acpi_erst (MACHINE_PC ,"x86" ); }static void test_acpi_q35_acpi_erst (void ) { -test_acpi_erst (MACHINE_Q35 ); +test_acpi_erst (MACHINE_Q35 ,"x86" ); }static void test_acpi_microvm_acpi_erst (void )
@@ -1978,6 +2020,7 @@ static void test_acpi_q35_viot(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".viot" , };
@@ -2002,6 +2045,7 @@ static void test_acpi_q35_cxl(void)test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".cxl" , };/*
@@ -2067,6 +2111,7 @@ static void test_acpi_q35_slic(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".slic" , };
@@ -2081,6 +2126,7 @@ static void test_acpi_q35_applesmc(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".applesmc" , };
@@ -2094,6 +2140,7 @@ static void test_acpi_q35_pvpanic_isa(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".pvpanic-isa" , };
@@ -2106,6 +2153,7 @@ static void test_acpi_pc_smbios_options(void)uint8_t req_type11[] = {11 };test_data data = { .machine =MACHINE_PC , + .arch ="x86" , .variant =".pc_smbios_options" , .required_struct_types = req_type11, .required_struct_types_len =ARRAY_SIZE (req_type11),
@@ -2120,6 +2168,7 @@ static void test_acpi_pc_smbios_blob(void)uint8_t req_type11[] = {11 };test_data data = { .machine =MACHINE_PC , + .arch ="x86" , .variant =".pc_smbios_blob" , .required_struct_types = req_type11, .required_struct_types_len =ARRAY_SIZE (req_type11),
@@ -2169,6 +2218,7 @@ static void test_acpi_piix4_oem_fields(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
@@ -2187,6 +2237,7 @@ static void test_acpi_q35_oem_fields(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
Signature · 1 line
2.40.1
Re: [PATCH v3 07/15] tests/qtest/bios-tables-test.c: Set "arch" for x86 tests
Quoted 4 lines · On Fri, 21 Jun 2024 17:28:58 +0530 Sunil V L <[email protected]> wrote:
To search for expected AML files under ${arch}/${machine} path, set this field for X86 related test cases.
Signed-off-by Sunil V L <[email protected]>
Quoted 495 lines
--- tests/qtest/bios-tables-test.c | 77 ++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 13 deletions(-)tests/qtest/bios-tables-test.c +64
-13@@ -933,6 +933,7 @@ static void test_acpi_piix4_tcg(void)* This is to make guest actually run. */ data.machine =MACHINE_PC ; + data.arch ="x86" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);test_acpi_one (NULL , &data);@@ -944,6 +945,7 @@ static void test_acpi_piix4_tcg_bridge(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".bridge" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);@@ -981,6 +983,7 @@ static void test_acpi_piix4_no_root_hotplug(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".roothp" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);@@ -997,6 +1000,7 @@ static void test_acpi_piix4_no_bridge_hotplug(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".hpbridge" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);@@ -1013,6 +1017,7 @@ static void test_acpi_piix4_no_acpi_pci_hotplug(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".hpbrroot" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);@@ -1034,6 +1039,7 @@ static void test_acpi_q35_tcg(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);test_acpi_one (NULL , &data);@@ -1049,6 +1055,7 @@ static void test_acpi_q35_kvm_type4_count(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".type4-count" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),@@ -1065,6 +1072,7 @@ static void test_acpi_q35_kvm_core_count(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".core-count" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),@@ -1082,6 +1090,7 @@ static void test_acpi_q35_kvm_core_count2(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".core-count2" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),@@ -1099,6 +1108,7 @@ static void test_acpi_q35_kvm_thread_count(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".thread-count" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),@@ -1116,6 +1126,7 @@ static void test_acpi_q35_kvm_thread_count2(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".thread-count2" , .required_struct_types = base_required_struct_types, .required_struct_types_len =ARRAY_SIZE (base_required_struct_types),@@ -1134,6 +1145,7 @@ static void test_acpi_q35_tcg_bridge(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".bridge" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);@@ -1148,6 +1160,7 @@ static void test_acpi_q35_tcg_no_acpi_hotplug(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".noacpihp" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);@@ -1176,6 +1189,7 @@ static void test_acpi_q35_multif_bridge(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".multi-bridge" , }; test_vm_prepare("-S"@@ -1225,6 +1239,7 @@ static void test_acpi_q35_tcg_mmio64(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".mmio64" , .tcg_only = true, .required_struct_types = base_required_struct_types,@@ -1245,6 +1260,7 @@ static void test_acpi_piix4_tcg_cphp(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".cphp" ;test_acpi_one ("-smp 2,cores=3,sockets=2,maxcpus=6" " -object memory-backend-ram,id=ram0,size=64M"@@ -1260,6 +1276,7 @@ static void test_acpi_q35_tcg_cphp(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".cphp" ;test_acpi_one (" -smp 2,cores=3,sockets=2,maxcpus=6" " -object memory-backend-ram,id=ram0,size=64M"@@ -1279,6 +1296,7 @@ static void test_acpi_q35_tcg_ipmi(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".ipmibt" ; data.required_struct_types = ipmi_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (ipmi_required_struct_types);@@ -1293,6 +1311,7 @@ static void test_acpi_q35_tcg_smbus_ipmi(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".ipmismbus" ; data.required_struct_types = ipmi_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (ipmi_required_struct_types);@@ -1310,6 +1329,7 @@ static void test_acpi_piix4_tcg_ipmi(void)* This is to make guest actually run. */ data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".ipmikcs" ; data.required_struct_types = ipmi_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (ipmi_required_struct_types);@@ -1324,6 +1344,7 @@ static void test_acpi_q35_tcg_memhp(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".memhp" ;test_acpi_one (" -m 128,slots=3,maxmem=1G" " -object memory-backend-ram,id=ram0,size=64M"@@ -1339,6 +1360,7 @@ static void test_acpi_piix4_tcg_memhp(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".memhp" ;test_acpi_one (" -m 128,slots=3,maxmem=1G" " -object memory-backend-ram,id=ram0,size=64M"@@ -1354,6 +1376,7 @@ static void test_acpi_piix4_tcg_nosmm(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".nosmm" ;test_acpi_one ("-machine smm=off" , &data);free_test_data (&data);@@ -1364,6 +1387,7 @@ static void test_acpi_piix4_tcg_smm_compat(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".smm-compat" ;test_acpi_one ("-global PIIX4_PM.smm-compat=on" , &data);free_test_data (&data);@@ -1374,6 +1398,7 @@ static void test_acpi_piix4_tcg_smm_compat_nosmm(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".smm-compat-nosmm" ;test_acpi_one ("-global PIIX4_PM.smm-compat=on -machine smm=off" , &data);free_test_data (&data);@@ -1384,6 +1409,7 @@ static void test_acpi_piix4_tcg_nohpet(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.machine_param =",hpet=off" ; data.variant =".nohpet" ;test_acpi_one (NULL , &data);@@ -1395,6 +1421,7 @@ static void test_acpi_q35_tcg_numamem(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".numamem" ;test_acpi_one (" -object memory-backend-ram,id=ram0,size=128M" " -numa node -numa node,memdev=ram0" , &data);@@ -1406,6 +1433,7 @@ static void test_acpi_q35_kvm_xapic(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".xapic" ;test_acpi_one (" -object memory-backend-ram,id=ram0,size=128M" " -numa node -numa node,memdev=ram0"@@ -1418,6 +1446,7 @@ static void test_acpi_q35_tcg_nosmm(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".nosmm" ;test_acpi_one ("-machine smm=off" , &data);free_test_data (&data);@@ -1428,6 +1457,7 @@ static void test_acpi_q35_tcg_smm_compat(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".smm-compat" ;test_acpi_one ("-global ICH9-LPC.smm-compat=on" , &data);free_test_data (&data);@@ -1438,6 +1468,7 @@ static void test_acpi_q35_tcg_smm_compat_nosmm(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".smm-compat-nosmm" ;test_acpi_one ("-global ICH9-LPC.smm-compat=on -machine smm=off" , &data);free_test_data (&data);@@ -1448,6 +1479,7 @@ static void test_acpi_q35_tcg_nohpet(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.machine_param =",hpet=off" ; data.variant =".nohpet" ;test_acpi_one (NULL , &data);@@ -1459,6 +1491,7 @@ static void test_acpi_q35_kvm_dmar(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".dmar" ;test_acpi_one ("-machine kernel-irqchip=split -accel kvm" " -device intel-iommu,intremap=on,device-iotlb=on" , &data);@@ -1470,6 +1503,7 @@ static void test_acpi_q35_tcg_ivrs(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" , data.variant =".ivrs" ; data.tcg_only = true,test_acpi_one (" -device amd-iommu" , &data);@@ -1481,6 +1515,7 @@ static void test_acpi_piix4_tcg_numamem(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.variant =".numamem" ;test_acpi_one (" -object memory-backend-ram,id=ram0,size=128M" " -numa node -numa node,memdev=ram0" , &data);@@ -1489,8 +1524,9 @@ static void test_acpi_piix4_tcg_numamem(void)uint64_t tpm_tis_base_addr; -static void test_acpi_tcg_tpm (const char *machine,const char *tpm_if, -uint64_t base,enum TPMVersion tpm_version) +static void test_acpi_tcg_tpm (const char *machine,const char *arch, +const char *tpm_if,uint64_t base, +enum TPMVersion tpm_version) {gchar *tmp_dir_name =g_strdup_printf ("qemu-test_acpi_%s_tcg_%s.XXXXXX" , machine, tpm_if);@@ -1517,6 +1553,7 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,tpm_emu_test_wait_cond (&test); data.machine = machine; + data.arch = arch; data.variant = variant; args = g_strdup_printf(@@ -1540,19 +1577,20 @@ static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if,static void test_acpi_q35_tcg_tpm2_tis (void ) { -test_acpi_tcg_tpm ("q35" ,"tis" ,0xFED40000 ,TPM_VERSION_2_0 ); +test_acpi_tcg_tpm ("q35" ,"x86" ,"tis" ,0xFED40000 ,TPM_VERSION_2_0 ); }static void test_acpi_q35_tcg_tpm12_tis (void ) { -test_acpi_tcg_tpm ("q35" ,"tis" ,0xFED40000 ,TPM_VERSION_1_2 ); +test_acpi_tcg_tpm ("q35" ,"x86" ,"tis" ,0xFED40000 ,TPM_VERSION_1_2 ); } -static void test_acpi_tcg_dimm_pxm (const char *machine) +static void test_acpi_tcg_dimm_pxm (const char *machine,const char *arch) {test_data data = {}; data.machine = machine; + data.arch = arch; data.variant =".dimmpxm" ;test_acpi_one (" -machine nvdimm=on,nvdimm-persistence=cpu" " -smp 4,sockets=4"@@ -1579,12 +1617,12 @@ static void test_acpi_tcg_dimm_pxm(const char *machine)static void test_acpi_q35_tcg_dimm_pxm (void ) { -test_acpi_tcg_dimm_pxm (MACHINE_Q35 ); +test_acpi_tcg_dimm_pxm (MACHINE_Q35 ,"x86" ); }static void test_acpi_piix4_tcg_dimm_pxm (void ) { -test_acpi_tcg_dimm_pxm (MACHINE_PC ); +test_acpi_tcg_dimm_pxm (MACHINE_PC ,"x86" ); }static void test_acpi_aarch64_virt_tcg_memhp (void )@@ -1621,6 +1659,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)static void test_acpi_microvm_prepare (test_data *data) { data->machine ="microvm" ; + data->arch ="x86" ; data->required_struct_types =NULL ;/* no smbios */ data->required_struct_types_len =0 ; data->blkdev ="virtio-blk-device" ;@@ -1737,11 +1776,12 @@ static void test_acpi_aarch64_virt_tcg_pxb(void)free_test_data (&data); } -static void test_acpi_tcg_acpi_hmat (const char *machine) +static void test_acpi_tcg_acpi_hmat (const char *machine,const char *arch) {test_data data = {}; data.machine = machine; + data.arch = arch; data.variant =".acpihmat" ;test_acpi_one (" -machine hmat=on" " -smp 2,sockets=2"@@ -1770,12 +1810,12 @@ static void test_acpi_tcg_acpi_hmat(const char *machine)static void test_acpi_q35_tcg_acpi_hmat (void ) { -test_acpi_tcg_acpi_hmat (MACHINE_Q35 ); +test_acpi_tcg_acpi_hmat (MACHINE_Q35 ,"x86" ); }static void test_acpi_piix4_tcg_acpi_hmat (void ) { -test_acpi_tcg_acpi_hmat (MACHINE_PC ); +test_acpi_tcg_acpi_hmat (MACHINE_PC ,"x86" ); }static void test_acpi_aarch64_virt_tcg_acpi_hmat (void )@@ -1841,6 +1881,7 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" ; data.variant =".acpihmat-noinitiator" ;test_acpi_one (" -machine hmat=on" " -smp 4,sockets=2"@@ -1884,13 +1925,14 @@ static void test_acpi_q35_tcg_acpi_hmat_noinitiator(void) }#ifdef CONFIG_POSIX -static void test_acpi_erst (const char *machine) +static void test_acpi_erst (const char *machine,const char *arch) {gchar *tmp_path =g_dir_make_tmp ("qemu-test-erst.XXXXXX" ,NULL );gchar *params;test_data data = {}; data.machine = machine; + data.arch = arch; data.variant =".acpierst" ; params =g_strdup_printf ( " -object memory-backend-file,id=erstnvram,"@@ -1905,12 +1947,12 @@ static void test_acpi_erst(const char *machine)static void test_acpi_piix4_acpi_erst (void ) { -test_acpi_erst (MACHINE_PC ); +test_acpi_erst (MACHINE_PC ,"x86" ); }static void test_acpi_q35_acpi_erst (void ) { -test_acpi_erst (MACHINE_Q35 ); +test_acpi_erst (MACHINE_Q35 ,"x86" ); }static void test_acpi_microvm_acpi_erst (void )@@ -1978,6 +2020,7 @@ static void test_acpi_q35_viot(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".viot" , };@@ -2002,6 +2045,7 @@ static void test_acpi_q35_cxl(void)test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".cxl" , };/* @@ -2067,6 +2111,7 @@ static void test_acpi_q35_slic(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".slic" , };@@ -2081,6 +2126,7 @@ static void test_acpi_q35_applesmc(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".applesmc" , };@@ -2094,6 +2140,7 @@ static void test_acpi_q35_pvpanic_isa(void) {test_data data = { .machine =MACHINE_Q35 , + .arch ="x86" , .variant =".pvpanic-isa" , };@@ -2106,6 +2153,7 @@ static void test_acpi_pc_smbios_options(void)uint8_t req_type11[] = {11 };test_data data = { .machine =MACHINE_PC , + .arch ="x86" , .variant =".pc_smbios_options" , .required_struct_types = req_type11, .required_struct_types_len =ARRAY_SIZE (req_type11),@@ -2120,6 +2168,7 @@ static void test_acpi_pc_smbios_blob(void)uint8_t req_type11[] = {11 };test_data data = { .machine =MACHINE_PC , + .arch ="x86" , .variant =".pc_smbios_blob" , .required_struct_types = req_type11, .required_struct_types_len =ARRAY_SIZE (req_type11),@@ -2169,6 +2218,7 @@ static void test_acpi_piix4_oem_fields(void)test_data data = {}; data.machine =MACHINE_PC ; + data.arch ="x86" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);@@ -2187,6 +2237,7 @@ static void test_acpi_q35_oem_fields(void)test_data data = {}; data.machine =MACHINE_Q35 ; + data.arch ="x86" ; data.required_struct_types = base_required_struct_types; data.required_struct_types_len =ARRAY_SIZE (base_required_struct_types);
PATCH v3 8/15 tests/data/acpi: Move x86 ACPI tables under x86/${machine} path
In reply to Sunil V LTo support multiple architectures using same machine name, create x86 folder and move all x86 related AML files for each machine type inside.
---
tests/data/acpi/{ => x86}/microvm/APIC | Bin
tests/data/acpi/{ => x86}/microvm/APIC.ioapic2 | Bin
tests/data/acpi/{ => x86}/microvm/APIC.pcie | Bin
tests/data/acpi/{ => x86}/microvm/DSDT | Bin
tests/data/acpi/{ => x86}/microvm/DSDT.ioapic2 | Bin
tests/data/acpi/{ => x86}/microvm/DSDT.pcie | Bin
tests/data/acpi/{ => x86}/microvm/DSDT.rtc | Bin
tests/data/acpi/{ => x86}/microvm/DSDT.usb | Bin
tests/data/acpi/{ => x86}/microvm/ERST.pcie | Bin
tests/data/acpi/{ => x86}/microvm/FACP | Bin
tests/data/acpi/{ => x86}/pc/APIC | Bin
tests/data/acpi/{ => x86}/pc/APIC.acpihmat | Bin
tests/data/acpi/{ => x86}/pc/APIC.cphp | Bin
tests/data/acpi/{ => x86}/pc/APIC.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/DSDT | Bin
tests/data/acpi/{ => x86}/pc/DSDT.acpierst | Bin
tests/data/acpi/{ => x86}/pc/DSDT.acpihmat | Bin
tests/data/acpi/{ => x86}/pc/DSDT.bridge | Bin
tests/data/acpi/{ => x86}/pc/DSDT.cphp | Bin
tests/data/acpi/{ => x86}/pc/DSDT.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/DSDT.hpbridge | Bin
tests/data/acpi/{ => x86}/pc/DSDT.hpbrroot | Bin
tests/data/acpi/{ => x86}/pc/DSDT.ipmikcs | Bin
tests/data/acpi/{ => x86}/pc/DSDT.memhp | Bin
tests/data/acpi/{ => x86}/pc/DSDT.nohpet | Bin
tests/data/acpi/{ => x86}/pc/DSDT.numamem | Bin
tests/data/acpi/{ => x86}/pc/DSDT.roothp | Bin
tests/data/acpi/{ => x86}/pc/ERST.acpierst | Bin
tests/data/acpi/{ => x86}/pc/FACP | Bin
tests/data/acpi/{ => x86}/pc/FACP.nosmm | Bin
tests/data/acpi/{ => x86}/pc/FACS | Bin
tests/data/acpi/{ => x86}/pc/HMAT.acpihmat | Bin
tests/data/acpi/{ => x86}/pc/HPET | Bin
tests/data/acpi/{ => x86}/pc/NFIT.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/SLIT.cphp | Bin
tests/data/acpi/{ => x86}/pc/SLIT.memhp | Bin
tests/data/acpi/{ => x86}/pc/SRAT.acpihmat | Bin
tests/data/acpi/{ => x86}/pc/SRAT.cphp | Bin
tests/data/acpi/{ => x86}/pc/SRAT.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/SRAT.memhp | Bin
tests/data/acpi/{ => x86}/pc/SRAT.numamem | Bin
tests/data/acpi/{ => x86}/pc/SSDT.dimmpxm | Bin
tests/data/acpi/{ => x86}/pc/WAET | Bin
tests/data/acpi/{ => x86}/q35/APIC | Bin
tests/data/acpi/{ => x86}/q35/APIC.acpihmat | Bin
.../acpi/{ => x86}/q35/APIC.acpihmat-noinitiator | Bin
tests/data/acpi/{ => x86}/q35/APIC.core-count | Bin
tests/data/acpi/{ => x86}/q35/APIC.core-count2 | Bin
tests/data/acpi/{ => x86}/q35/APIC.cphp | Bin
tests/data/acpi/{ => x86}/q35/APIC.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/APIC.thread-count | Bin
tests/data/acpi/{ => x86}/q35/APIC.thread-count2 | Bin
tests/data/acpi/{ => x86}/q35/APIC.type4-count | Bin
tests/data/acpi/{ => x86}/q35/APIC.xapic | Bin
tests/data/acpi/{ => x86}/q35/CEDT.cxl | Bin
tests/data/acpi/{ => x86}/q35/DMAR.dmar | Bin
tests/data/acpi/{ => x86}/q35/DSDT | Bin
tests/data/acpi/{ => x86}/q35/DSDT.acpierst | Bin
tests/data/acpi/{ => x86}/q35/DSDT.acpihmat | Bin
.../acpi/{ => x86}/q35/DSDT.acpihmat-noinitiator | Bin
tests/data/acpi/{ => x86}/q35/DSDT.applesmc | Bin
tests/data/acpi/{ => x86}/q35/DSDT.bridge | Bin
tests/data/acpi/{ => x86}/q35/DSDT.core-count | Bin
tests/data/acpi/{ => x86}/q35/DSDT.core-count2 | Bin
tests/data/acpi/{ => x86}/q35/DSDT.cphp | Bin
tests/data/acpi/{ => x86}/q35/DSDT.cxl | Bin
tests/data/acpi/{ => x86}/q35/DSDT.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/DSDT.ipmibt | Bin
tests/data/acpi/{ => x86}/q35/DSDT.ipmismbus | Bin
tests/data/acpi/{ => x86}/q35/DSDT.ivrs | Bin
tests/data/acpi/{ => x86}/q35/DSDT.memhp | Bin
tests/data/acpi/{ => x86}/q35/DSDT.mmio64 | Bin
tests/data/acpi/{ => x86}/q35/DSDT.multi-bridge | Bin
tests/data/acpi/{ => x86}/q35/DSDT.noacpihp | Bin
tests/data/acpi/{ => x86}/q35/DSDT.nohpet | Bin
tests/data/acpi/{ => x86}/q35/DSDT.numamem | Bin
tests/data/acpi/{ => x86}/q35/DSDT.pvpanic-isa | Bin
tests/data/acpi/{ => x86}/q35/DSDT.thread-count | Bin
tests/data/acpi/{ => x86}/q35/DSDT.thread-count2 | Bin
tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm12 | Bin
tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm2 | Bin
tests/data/acpi/{ => x86}/q35/DSDT.type4-count | Bin
tests/data/acpi/{ => x86}/q35/DSDT.viot | Bin
tests/data/acpi/{ => x86}/q35/DSDT.xapic | Bin
tests/data/acpi/{ => x86}/q35/ERST.acpierst | Bin
tests/data/acpi/{ => x86}/q35/FACP | Bin
tests/data/acpi/{ => x86}/q35/FACP.core-count | Bin
tests/data/acpi/{ => x86}/q35/FACP.core-count2 | Bin
tests/data/acpi/{ => x86}/q35/FACP.nosmm | Bin
tests/data/acpi/{ => x86}/q35/FACP.slic | Bin
tests/data/acpi/{ => x86}/q35/FACP.thread-count | Bin
tests/data/acpi/{ => x86}/q35/FACP.thread-count2 | Bin
tests/data/acpi/{ => x86}/q35/FACP.type4-count | Bin
tests/data/acpi/{ => x86}/q35/FACP.xapic | Bin
tests/data/acpi/{ => x86}/q35/FACS | Bin
tests/data/acpi/{ => x86}/q35/HMAT.acpihmat | Bin
.../acpi/{ => x86}/q35/HMAT.acpihmat-noinitiator | Bin
tests/data/acpi/{ => x86}/q35/HPET | Bin
tests/data/acpi/{ => x86}/q35/IVRS.ivrs | Bin
tests/data/acpi/{ => x86}/q35/MCFG | Bin
tests/data/acpi/{ => x86}/q35/NFIT.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/SLIC.slic | Bin
tests/data/acpi/{ => x86}/q35/SLIT.cphp | Bin
tests/data/acpi/{ => x86}/q35/SLIT.memhp | Bin
tests/data/acpi/{ => x86}/q35/SRAT.acpihmat | Bin
.../acpi/{ => x86}/q35/SRAT.acpihmat-noinitiator | Bin
tests/data/acpi/{ => x86}/q35/SRAT.cphp | Bin
tests/data/acpi/{ => x86}/q35/SRAT.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/SRAT.memhp | Bin
tests/data/acpi/{ => x86}/q35/SRAT.mmio64 | Bin
tests/data/acpi/{ => x86}/q35/SRAT.numamem | Bin
tests/data/acpi/{ => x86}/q35/SRAT.xapic | Bin
tests/data/acpi/{ => x86}/q35/SSDT.dimmpxm | Bin
tests/data/acpi/{ => x86}/q35/TCPA.tis.tpm12 | Bin
tests/data/acpi/{ => x86}/q35/TPM2.tis.tpm2 | Bin
tests/data/acpi/{ => x86}/q35/VIOT.viot | Bin
tests/data/acpi/{ => x86}/q35/WAET | Bin
117 files changed, 0 insertions(+), 0 deletions(-)
rename tests/data/acpi/{ => x86}/microvm/APIC (100%)
rename tests/data/acpi/{ => x86}/microvm/APIC.ioapic2 (100%)
rename tests/data/acpi/{ => x86}/microvm/APIC.pcie (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT.ioapic2 (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT.pcie (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT.rtc (100%)
rename tests/data/acpi/{ => x86}/microvm/DSDT.usb (100%)
rename tests/data/acpi/{ => x86}/microvm/ERST.pcie (100%)
rename tests/data/acpi/{ => x86}/microvm/FACP (100%)
rename tests/data/acpi/{ => x86}/pc/APIC (100%)
rename tests/data/acpi/{ => x86}/pc/APIC.acpihmat (100%)
rename tests/data/acpi/{ => x86}/pc/APIC.cphp (100%)
rename tests/data/acpi/{ => x86}/pc/APIC.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.acpierst (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.bridge (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.cphp (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.hpbridge (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.hpbrroot (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.ipmikcs (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.memhp (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.nohpet (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.numamem (100%)
rename tests/data/acpi/{ => x86}/pc/DSDT.roothp (100%)
rename tests/data/acpi/{ => x86}/pc/ERST.acpierst (100%)
rename tests/data/acpi/{ => x86}/pc/FACP (100%)
rename tests/data/acpi/{ => x86}/pc/FACP.nosmm (100%)
rename tests/data/acpi/{ => x86}/pc/FACS (100%)
rename tests/data/acpi/{ => x86}/pc/HMAT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/pc/HPET (100%)
rename tests/data/acpi/{ => x86}/pc/NFIT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/SLIT.cphp (100%)
rename tests/data/acpi/{ => x86}/pc/SLIT.memhp (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.cphp (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.memhp (100%)
rename tests/data/acpi/{ => x86}/pc/SRAT.numamem (100%)
rename tests/data/acpi/{ => x86}/pc/SSDT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/pc/WAET (100%)
rename tests/data/acpi/{ => x86}/q35/APIC (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.acpihmat (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.acpihmat-noinitiator (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.core-count (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.core-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.cphp (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.thread-count (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.thread-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.type4-count (100%)
rename tests/data/acpi/{ => x86}/q35/APIC.xapic (100%)
rename tests/data/acpi/{ => x86}/q35/CEDT.cxl (100%)
rename tests/data/acpi/{ => x86}/q35/DMAR.dmar (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.acpierst (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.acpihmat-noinitiator (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.applesmc (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.bridge (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.core-count (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.core-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.cphp (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.cxl (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.ipmibt (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.ipmismbus (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.ivrs (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.memhp (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.mmio64 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.multi-bridge (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.noacpihp (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.nohpet (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.numamem (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.pvpanic-isa (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.thread-count (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.thread-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm12 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm2 (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.type4-count (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.viot (100%)
rename tests/data/acpi/{ => x86}/q35/DSDT.xapic (100%)
rename tests/data/acpi/{ => x86}/q35/ERST.acpierst (100%)
rename tests/data/acpi/{ => x86}/q35/FACP (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.core-count (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.core-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.nosmm (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.slic (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.thread-count (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.thread-count2 (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.type4-count (100%)
rename tests/data/acpi/{ => x86}/q35/FACP.xapic (100%)
rename tests/data/acpi/{ => x86}/q35/FACS (100%)
rename tests/data/acpi/{ => x86}/q35/HMAT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/q35/HMAT.acpihmat-noinitiator (100%)
rename tests/data/acpi/{ => x86}/q35/HPET (100%)
rename tests/data/acpi/{ => x86}/q35/IVRS.ivrs (100%)
rename tests/data/acpi/{ => x86}/q35/MCFG (100%)
rename tests/data/acpi/{ => x86}/q35/NFIT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/SLIC.slic (100%)
rename tests/data/acpi/{ => x86}/q35/SLIT.cphp (100%)
rename tests/data/acpi/{ => x86}/q35/SLIT.memhp (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.acpihmat (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.acpihmat-noinitiator (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.cphp (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.memhp (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.mmio64 (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.numamem (100%)
rename tests/data/acpi/{ => x86}/q35/SRAT.xapic (100%)
rename tests/data/acpi/{ => x86}/q35/SSDT.dimmpxm (100%)
rename tests/data/acpi/{ => x86}/q35/TCPA.tis.tpm12 (100%)
rename tests/data/acpi/{ => x86}/q35/TPM2.tis.tpm2 (100%)
rename tests/data/acpi/{ => x86}/q35/VIOT.viot (100%)
rename tests/data/acpi/{ => x86}/q35/WAET (100%)tests/data/acpi/x86/microvm/APIC renamed from tests/data/acpi/microvm/APIC +0 -0
tests/data/acpi/x86/microvm/APIC.ioapic2 renamed from tests/data/acpi/microvm/APIC.ioapic2 +0 -0
tests/data/acpi/x86/microvm/APIC.pcie renamed from tests/data/acpi/microvm/APIC.pcie +0 -0
tests/data/acpi/x86/microvm/DSDT renamed from tests/data/acpi/microvm/DSDT +0 -0
tests/data/acpi/x86/microvm/DSDT.ioapic2 renamed from tests/data/acpi/microvm/DSDT.ioapic2 +0 -0
tests/data/acpi/x86/microvm/DSDT.pcie renamed from tests/data/acpi/microvm/DSDT.pcie +0 -0
tests/data/acpi/x86/microvm/DSDT.rtc renamed from tests/data/acpi/microvm/DSDT.rtc +0 -0
tests/data/acpi/x86/microvm/DSDT.usb renamed from tests/data/acpi/microvm/DSDT.usb +0 -0
tests/data/acpi/x86/microvm/ERST.pcie renamed from tests/data/acpi/microvm/ERST.pcie +0 -0
tests/data/acpi/x86/microvm/FACP renamed from tests/data/acpi/microvm/FACP +0 -0
tests/data/acpi/x86/pc/APIC renamed from tests/data/acpi/pc/APIC +0 -0
tests/data/acpi/x86/pc/APIC.acpihmat renamed from tests/data/acpi/pc/APIC.acpihmat +0 -0
tests/data/acpi/x86/pc/APIC.cphp renamed from tests/data/acpi/pc/APIC.cphp +0 -0
tests/data/acpi/x86/pc/APIC.dimmpxm renamed from tests/data/acpi/pc/APIC.dimmpxm +0 -0
tests/data/acpi/x86/pc/DSDT renamed from tests/data/acpi/pc/DSDT +0 -0
tests/data/acpi/x86/pc/DSDT.acpierst renamed from tests/data/acpi/pc/DSDT.acpierst +0 -0
tests/data/acpi/x86/pc/DSDT.acpihmat renamed from tests/data/acpi/pc/DSDT.acpihmat +0 -0
tests/data/acpi/x86/pc/DSDT.bridge renamed from tests/data/acpi/pc/DSDT.bridge +0 -0
tests/data/acpi/x86/pc/DSDT.cphp renamed from tests/data/acpi/pc/DSDT.cphp +0 -0
tests/data/acpi/x86/pc/DSDT.dimmpxm renamed from tests/data/acpi/pc/DSDT.dimmpxm +0 -0
tests/data/acpi/x86/pc/DSDT.hpbridge renamed from tests/data/acpi/pc/DSDT.hpbridge +0 -0
tests/data/acpi/x86/pc/DSDT.hpbrroot renamed from tests/data/acpi/pc/DSDT.hpbrroot +0 -0
tests/data/acpi/x86/pc/DSDT.ipmikcs renamed from tests/data/acpi/pc/DSDT.ipmikcs +0 -0
tests/data/acpi/x86/pc/DSDT.memhp renamed from tests/data/acpi/pc/DSDT.memhp +0 -0
tests/data/acpi/x86/pc/DSDT.nohpet renamed from tests/data/acpi/pc/DSDT.nohpet +0 -0
tests/data/acpi/x86/pc/DSDT.numamem renamed from tests/data/acpi/pc/DSDT.numamem +0 -0
tests/data/acpi/x86/pc/DSDT.roothp renamed from tests/data/acpi/pc/DSDT.roothp +0 -0
tests/data/acpi/x86/pc/ERST.acpierst renamed from tests/data/acpi/pc/ERST.acpierst +0 -0
tests/data/acpi/x86/pc/FACP renamed from tests/data/acpi/pc/FACP +0 -0
tests/data/acpi/x86/pc/FACP.nosmm renamed from tests/data/acpi/pc/FACP.nosmm +0 -0
tests/data/acpi/x86/pc/FACS renamed from tests/data/acpi/pc/FACS +0 -0
tests/data/acpi/x86/pc/HMAT.acpihmat renamed from tests/data/acpi/pc/HMAT.acpihmat +0 -0
tests/data/acpi/x86/pc/HPET renamed from tests/data/acpi/pc/HPET +0 -0
tests/data/acpi/x86/pc/NFIT.dimmpxm renamed from tests/data/acpi/pc/NFIT.dimmpxm +0 -0
tests/data/acpi/x86/pc/SLIT.cphp renamed from tests/data/acpi/pc/SLIT.cphp +0 -0
tests/data/acpi/x86/pc/SLIT.memhp renamed from tests/data/acpi/pc/SLIT.memhp +0 -0
tests/data/acpi/x86/pc/SRAT.acpihmat renamed from tests/data/acpi/pc/SRAT.acpihmat +0 -0
tests/data/acpi/x86/pc/SRAT.cphp renamed from tests/data/acpi/pc/SRAT.cphp +0 -0
tests/data/acpi/x86/pc/SRAT.dimmpxm renamed from tests/data/acpi/pc/SRAT.dimmpxm +0 -0
tests/data/acpi/x86/pc/SRAT.memhp renamed from tests/data/acpi/pc/SRAT.memhp +0 -0
tests/data/acpi/x86/pc/SRAT.numamem renamed from tests/data/acpi/pc/SRAT.numamem +0 -0
tests/data/acpi/x86/pc/SSDT.dimmpxm renamed from tests/data/acpi/pc/SSDT.dimmpxm +0 -0
tests/data/acpi/x86/pc/WAET renamed from tests/data/acpi/pc/WAET +0 -0
tests/data/acpi/x86/q35/APIC renamed from tests/data/acpi/q35/APIC +0 -0
tests/data/acpi/x86/q35/APIC.acpihmat renamed from tests/data/acpi/q35/APIC.acpihmat +0 -0
tests/data/acpi/x86/q35/APIC.acpihmat-noinitiator renamed from tests/data/acpi/q35/APIC.acpihmat-noinitiator +0 -0
tests/data/acpi/x86/q35/APIC.core-count renamed from tests/data/acpi/q35/APIC.core-count +0 -0
tests/data/acpi/x86/q35/APIC.core-count2 renamed from tests/data/acpi/q35/APIC.core-count2 +0 -0
tests/data/acpi/x86/q35/APIC.cphp renamed from tests/data/acpi/q35/APIC.cphp +0 -0
tests/data/acpi/x86/q35/APIC.dimmpxm renamed from tests/data/acpi/q35/APIC.dimmpxm +0 -0
tests/data/acpi/x86/q35/APIC.thread-count renamed from tests/data/acpi/q35/APIC.thread-count +0 -0
tests/data/acpi/x86/q35/APIC.thread-count2 renamed from tests/data/acpi/q35/APIC.thread-count2 +0 -0
tests/data/acpi/x86/q35/APIC.type4-count renamed from tests/data/acpi/q35/APIC.type4-count +0 -0
tests/data/acpi/x86/q35/APIC.xapic renamed from tests/data/acpi/q35/APIC.xapic +0 -0
tests/data/acpi/x86/q35/CEDT.cxl renamed from tests/data/acpi/q35/CEDT.cxl +0 -0
tests/data/acpi/x86/q35/DMAR.dmar renamed from tests/data/acpi/q35/DMAR.dmar +0 -0
tests/data/acpi/x86/q35/DSDT renamed from tests/data/acpi/q35/DSDT +0 -0
tests/data/acpi/x86/q35/DSDT.acpierst renamed from tests/data/acpi/q35/DSDT.acpierst +0 -0
tests/data/acpi/x86/q35/DSDT.acpihmat renamed from tests/data/acpi/q35/DSDT.acpihmat +0 -0
tests/data/acpi/x86/q35/DSDT.acpihmat-noinitiator renamed from tests/data/acpi/q35/DSDT.acpihmat-noinitiator +0 -0
tests/data/acpi/x86/q35/DSDT.applesmc renamed from tests/data/acpi/q35/DSDT.applesmc +0 -0
tests/data/acpi/x86/q35/DSDT.bridge renamed from tests/data/acpi/q35/DSDT.bridge +0 -0
tests/data/acpi/x86/q35/DSDT.core-count renamed from tests/data/acpi/q35/DSDT.core-count +0 -0
tests/data/acpi/x86/q35/DSDT.core-count2 renamed from tests/data/acpi/q35/DSDT.core-count2 +0 -0
tests/data/acpi/x86/q35/DSDT.cphp renamed from tests/data/acpi/q35/DSDT.cphp +0 -0
tests/data/acpi/x86/q35/DSDT.cxl renamed from tests/data/acpi/q35/DSDT.cxl +0 -0
tests/data/acpi/x86/q35/DSDT.dimmpxm renamed from tests/data/acpi/q35/DSDT.dimmpxm +0 -0
tests/data/acpi/x86/q35/DSDT.ipmibt renamed from tests/data/acpi/q35/DSDT.ipmibt +0 -0
tests/data/acpi/x86/q35/DSDT.ipmismbus renamed from tests/data/acpi/q35/DSDT.ipmismbus +0 -0
tests/data/acpi/x86/q35/DSDT.ivrs renamed from tests/data/acpi/q35/DSDT.ivrs +0 -0
tests/data/acpi/x86/q35/DSDT.memhp renamed from tests/data/acpi/q35/DSDT.memhp +0 -0
tests/data/acpi/x86/q35/DSDT.mmio64 renamed from tests/data/acpi/q35/DSDT.mmio64 +0 -0
tests/data/acpi/x86/q35/DSDT.multi-bridge renamed from tests/data/acpi/q35/DSDT.multi-bridge +0 -0
tests/data/acpi/x86/q35/DSDT.noacpihp renamed from tests/data/acpi/q35/DSDT.noacpihp +0 -0
tests/data/acpi/x86/q35/DSDT.nohpet renamed from tests/data/acpi/q35/DSDT.nohpet +0 -0
tests/data/acpi/x86/q35/DSDT.numamem renamed from tests/data/acpi/q35/DSDT.numamem +0 -0
tests/data/acpi/x86/q35/DSDT.pvpanic-isa renamed from tests/data/acpi/q35/DSDT.pvpanic-isa +0 -0
tests/data/acpi/x86/q35/DSDT.thread-count renamed from tests/data/acpi/q35/DSDT.thread-count +0 -0
tests/data/acpi/x86/q35/DSDT.thread-count2 renamed from tests/data/acpi/q35/DSDT.thread-count2 +0 -0
tests/data/acpi/x86/q35/DSDT.tis.tpm12 renamed from tests/data/acpi/q35/DSDT.tis.tpm12 +0 -0
tests/data/acpi/x86/q35/DSDT.tis.tpm2 renamed from tests/data/acpi/q35/DSDT.tis.tpm2 +0 -0
tests/data/acpi/x86/q35/DSDT.type4-count renamed from tests/data/acpi/q35/DSDT.type4-count +0 -0
tests/data/acpi/x86/q35/DSDT.viot renamed from tests/data/acpi/q35/DSDT.viot +0 -0
tests/data/acpi/x86/q35/DSDT.xapic renamed from tests/data/acpi/q35/DSDT.xapic +0 -0
tests/data/acpi/x86/q35/ERST.acpierst renamed from tests/data/acpi/q35/ERST.acpierst +0 -0
tests/data/acpi/x86/q35/FACP renamed from tests/data/acpi/q35/FACP +0 -0
tests/data/acpi/x86/q35/FACP.core-count renamed from tests/data/acpi/q35/FACP.core-count +0 -0
tests/data/acpi/x86/q35/FACP.core-count2 renamed from tests/data/acpi/q35/FACP.core-count2 +0 -0
tests/data/acpi/x86/q35/FACP.nosmm renamed from tests/data/acpi/q35/FACP.nosmm +0 -0
tests/data/acpi/x86/q35/FACP.slic renamed from tests/data/acpi/q35/FACP.slic +0 -0
tests/data/acpi/x86/q35/FACP.thread-count renamed from tests/data/acpi/q35/FACP.thread-count +0 -0
tests/data/acpi/x86/q35/FACP.thread-count2 renamed from tests/data/acpi/q35/FACP.thread-count2 +0 -0
tests/data/acpi/x86/q35/FACP.type4-count renamed from tests/data/acpi/q35/FACP.type4-count +0 -0
tests/data/acpi/x86/q35/FACP.xapic renamed from tests/data/acpi/q35/FACP.xapic +0 -0
tests/data/acpi/x86/q35/FACS renamed from tests/data/acpi/q35/FACS +0 -0
tests/data/acpi/x86/q35/HMAT.acpihmat renamed from tests/data/acpi/q35/HMAT.acpihmat +0 -0
tests/data/acpi/x86/q35/HMAT.acpihmat-noinitiator renamed from tests/data/acpi/q35/HMAT.acpihmat-noinitiator +0 -0
tests/data/acpi/x86/q35/HPET renamed from tests/data/acpi/q35/HPET +0 -0
tests/data/acpi/x86/q35/IVRS.ivrs renamed from tests/data/acpi/q35/IVRS.ivrs +0 -0
tests/data/acpi/x86/q35/MCFG renamed from tests/data/acpi/q35/MCFG +0 -0
tests/data/acpi/x86/q35/NFIT.dimmpxm renamed from tests/data/acpi/q35/NFIT.dimmpxm +0 -0
tests/data/acpi/x86/q35/SLIC.slic renamed from tests/data/acpi/q35/SLIC.slic +0 -0
tests/data/acpi/x86/q35/SLIT.cphp renamed from tests/data/acpi/q35/SLIT.cphp +0 -0
tests/data/acpi/x86/q35/SLIT.memhp renamed from tests/data/acpi/q35/SLIT.memhp +0 -0
tests/data/acpi/x86/q35/SRAT.acpihmat renamed from tests/data/acpi/q35/SRAT.acpihmat +0 -0
tests/data/acpi/x86/q35/SRAT.acpihmat-noinitiator renamed from tests/data/acpi/q35/SRAT.acpihmat-noinitiator +0 -0
tests/data/acpi/x86/q35/SRAT.cphp renamed from tests/data/acpi/q35/SRAT.cphp +0 -0
tests/data/acpi/x86/q35/SRAT.dimmpxm renamed from tests/data/acpi/q35/SRAT.dimmpxm +0 -0
tests/data/acpi/x86/q35/SRAT.memhp renamed from tests/data/acpi/q35/SRAT.memhp +0 -0
tests/data/acpi/x86/q35/SRAT.mmio64 renamed from tests/data/acpi/q35/SRAT.mmio64 +0 -0
tests/data/acpi/x86/q35/SRAT.numamem renamed from tests/data/acpi/q35/SRAT.numamem +0 -0
tests/data/acpi/x86/q35/SRAT.xapic renamed from tests/data/acpi/q35/SRAT.xapic +0 -0
tests/data/acpi/x86/q35/SSDT.dimmpxm renamed from tests/data/acpi/q35/SSDT.dimmpxm +0 -0
tests/data/acpi/x86/q35/TCPA.tis.tpm12 renamed from tests/data/acpi/q35/TCPA.tis.tpm12 +0 -0
tests/data/acpi/x86/q35/TPM2.tis.tpm2 renamed from tests/data/acpi/q35/TPM2.tis.tpm2 +0 -0
tests/data/acpi/x86/q35/VIOT.viot renamed from tests/data/acpi/q35/VIOT.viot +0 -0
tests/data/acpi/x86/q35/WAET renamed from tests/data/acpi/q35/WAET +0 -0
Signature · 1 line
2.40.1
Re: [PATCH v3 08/15] tests/data/acpi: Move x86 ACPI tables under x86/${machine} path
Quoted 4 lines · On Fri, 21 Jun 2024 17:28:59 +0530 Sunil V L <[email protected]> wrote:
To support multiple architectures using same machine name, create x86 folder and move all x86 related AML files for each machine type inside.
Signed-off-by Sunil V L <[email protected]>
Quoted 705 lines
--- tests/data/acpi/{ => x86}/microvm/APIC | Bin tests/data/acpi/{ => x86}/microvm/APIC.ioapic2 | Bin tests/data/acpi/{ => x86}/microvm/APIC.pcie | Bin tests/data/acpi/{ => x86}/microvm/DSDT | Bin tests/data/acpi/{ => x86}/microvm/DSDT.ioapic2 | Bin tests/data/acpi/{ => x86}/microvm/DSDT.pcie | Bin tests/data/acpi/{ => x86}/microvm/DSDT.rtc | Bin tests/data/acpi/{ => x86}/microvm/DSDT.usb | Bin tests/data/acpi/{ => x86}/microvm/ERST.pcie | Bin tests/data/acpi/{ => x86}/microvm/FACP | Bin tests/data/acpi/{ => x86}/pc/APIC | Bin tests/data/acpi/{ => x86}/pc/APIC.acpihmat | Bin tests/data/acpi/{ => x86}/pc/APIC.cphp | Bin tests/data/acpi/{ => x86}/pc/APIC.dimmpxm | Bin tests/data/acpi/{ => x86}/pc/DSDT | Bin tests/data/acpi/{ => x86}/pc/DSDT.acpierst | Bin tests/data/acpi/{ => x86}/pc/DSDT.acpihmat | Bin tests/data/acpi/{ => x86}/pc/DSDT.bridge | Bin tests/data/acpi/{ => x86}/pc/DSDT.cphp | Bin tests/data/acpi/{ => x86}/pc/DSDT.dimmpxm | Bin tests/data/acpi/{ => x86}/pc/DSDT.hpbridge | Bin tests/data/acpi/{ => x86}/pc/DSDT.hpbrroot | Bin tests/data/acpi/{ => x86}/pc/DSDT.ipmikcs | Bin tests/data/acpi/{ => x86}/pc/DSDT.memhp | Bin tests/data/acpi/{ => x86}/pc/DSDT.nohpet | Bin tests/data/acpi/{ => x86}/pc/DSDT.numamem | Bin tests/data/acpi/{ => x86}/pc/DSDT.roothp | Bin tests/data/acpi/{ => x86}/pc/ERST.acpierst | Bin tests/data/acpi/{ => x86}/pc/FACP | Bin tests/data/acpi/{ => x86}/pc/FACP.nosmm | Bin tests/data/acpi/{ => x86}/pc/FACS | Bin tests/data/acpi/{ => x86}/pc/HMAT.acpihmat | Bin tests/data/acpi/{ => x86}/pc/HPET | Bin tests/data/acpi/{ => x86}/pc/NFIT.dimmpxm | Bin tests/data/acpi/{ => x86}/pc/SLIT.cphp | Bin tests/data/acpi/{ => x86}/pc/SLIT.memhp | Bin tests/data/acpi/{ => x86}/pc/SRAT.acpihmat | Bin tests/data/acpi/{ => x86}/pc/SRAT.cphp | Bin tests/data/acpi/{ => x86}/pc/SRAT.dimmpxm | Bin tests/data/acpi/{ => x86}/pc/SRAT.memhp | Bin tests/data/acpi/{ => x86}/pc/SRAT.numamem | Bin tests/data/acpi/{ => x86}/pc/SSDT.dimmpxm | Bin tests/data/acpi/{ => x86}/pc/WAET | Bin tests/data/acpi/{ => x86}/q35/APIC | Bin tests/data/acpi/{ => x86}/q35/APIC.acpihmat | Bin .../acpi/{ => x86}/q35/APIC.acpihmat-noinitiator | Bin tests/data/acpi/{ => x86}/q35/APIC.core-count | Bin tests/data/acpi/{ => x86}/q35/APIC.core-count2 | Bin tests/data/acpi/{ => x86}/q35/APIC.cphp | Bin tests/data/acpi/{ => x86}/q35/APIC.dimmpxm | Bin tests/data/acpi/{ => x86}/q35/APIC.thread-count | Bin tests/data/acpi/{ => x86}/q35/APIC.thread-count2 | Bin tests/data/acpi/{ => x86}/q35/APIC.type4-count | Bin tests/data/acpi/{ => x86}/q35/APIC.xapic | Bin tests/data/acpi/{ => x86}/q35/CEDT.cxl | Bin tests/data/acpi/{ => x86}/q35/DMAR.dmar | Bin tests/data/acpi/{ => x86}/q35/DSDT | Bin tests/data/acpi/{ => x86}/q35/DSDT.acpierst | Bin tests/data/acpi/{ => x86}/q35/DSDT.acpihmat | Bin .../acpi/{ => x86}/q35/DSDT.acpihmat-noinitiator | Bin tests/data/acpi/{ => x86}/q35/DSDT.applesmc | Bin tests/data/acpi/{ => x86}/q35/DSDT.bridge | Bin tests/data/acpi/{ => x86}/q35/DSDT.core-count | Bin tests/data/acpi/{ => x86}/q35/DSDT.core-count2 | Bin tests/data/acpi/{ => x86}/q35/DSDT.cphp | Bin tests/data/acpi/{ => x86}/q35/DSDT.cxl | Bin tests/data/acpi/{ => x86}/q35/DSDT.dimmpxm | Bin tests/data/acpi/{ => x86}/q35/DSDT.ipmibt | Bin tests/data/acpi/{ => x86}/q35/DSDT.ipmismbus | Bin tests/data/acpi/{ => x86}/q35/DSDT.ivrs | Bin tests/data/acpi/{ => x86}/q35/DSDT.memhp | Bin tests/data/acpi/{ => x86}/q35/DSDT.mmio64 | Bin tests/data/acpi/{ => x86}/q35/DSDT.multi-bridge | Bin tests/data/acpi/{ => x86}/q35/DSDT.noacpihp | Bin tests/data/acpi/{ => x86}/q35/DSDT.nohpet | Bin tests/data/acpi/{ => x86}/q35/DSDT.numamem | Bin tests/data/acpi/{ => x86}/q35/DSDT.pvpanic-isa | Bin tests/data/acpi/{ => x86}/q35/DSDT.thread-count | Bin tests/data/acpi/{ => x86}/q35/DSDT.thread-count2 | Bin tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm12 | Bin tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm2 | Bin tests/data/acpi/{ => x86}/q35/DSDT.type4-count | Bin tests/data/acpi/{ => x86}/q35/DSDT.viot | Bin tests/data/acpi/{ => x86}/q35/DSDT.xapic | Bin tests/data/acpi/{ => x86}/q35/ERST.acpierst | Bin tests/data/acpi/{ => x86}/q35/FACP | Bin tests/data/acpi/{ => x86}/q35/FACP.core-count | Bin tests/data/acpi/{ => x86}/q35/FACP.core-count2 | Bin tests/data/acpi/{ => x86}/q35/FACP.nosmm | Bin tests/data/acpi/{ => x86}/q35/FACP.slic | Bin tests/data/acpi/{ => x86}/q35/FACP.thread-count | Bin tests/data/acpi/{ => x86}/q35/FACP.thread-count2 | Bin tests/data/acpi/{ => x86}/q35/FACP.type4-count | Bin tests/data/acpi/{ => x86}/q35/FACP.xapic | Bin tests/data/acpi/{ => x86}/q35/FACS | Bin tests/data/acpi/{ => x86}/q35/HMAT.acpihmat | Bin .../acpi/{ => x86}/q35/HMAT.acpihmat-noinitiator | Bin tests/data/acpi/{ => x86}/q35/HPET | Bin tests/data/acpi/{ => x86}/q35/IVRS.ivrs | Bin tests/data/acpi/{ => x86}/q35/MCFG | Bin tests/data/acpi/{ => x86}/q35/NFIT.dimmpxm | Bin tests/data/acpi/{ => x86}/q35/SLIC.slic | Bin tests/data/acpi/{ => x86}/q35/SLIT.cphp | Bin tests/data/acpi/{ => x86}/q35/SLIT.memhp | Bin tests/data/acpi/{ => x86}/q35/SRAT.acpihmat | Bin .../acpi/{ => x86}/q35/SRAT.acpihmat-noinitiator | Bin tests/data/acpi/{ => x86}/q35/SRAT.cphp | Bin tests/data/acpi/{ => x86}/q35/SRAT.dimmpxm | Bin tests/data/acpi/{ => x86}/q35/SRAT.memhp | Bin tests/data/acpi/{ => x86}/q35/SRAT.mmio64 | Bin tests/data/acpi/{ => x86}/q35/SRAT.numamem | Bin tests/data/acpi/{ => x86}/q35/SRAT.xapic | Bin tests/data/acpi/{ => x86}/q35/SSDT.dimmpxm | Bin tests/data/acpi/{ => x86}/q35/TCPA.tis.tpm12 | Bin tests/data/acpi/{ => x86}/q35/TPM2.tis.tpm2 | Bin tests/data/acpi/{ => x86}/q35/VIOT.viot | Bin tests/data/acpi/{ => x86}/q35/WAET | Bin 117 files changed, 0 insertions(+), 0 deletions(-) rename tests/data/acpi/{ => x86}/microvm/APIC (100%) rename tests/data/acpi/{ => x86}/microvm/APIC.ioapic2 (100%) rename tests/data/acpi/{ => x86}/microvm/APIC.pcie (100%) rename tests/data/acpi/{ => x86}/microvm/DSDT (100%) rename tests/data/acpi/{ => x86}/microvm/DSDT.ioapic2 (100%) rename tests/data/acpi/{ => x86}/microvm/DSDT.pcie (100%) rename tests/data/acpi/{ => x86}/microvm/DSDT.rtc (100%) rename tests/data/acpi/{ => x86}/microvm/DSDT.usb (100%) rename tests/data/acpi/{ => x86}/microvm/ERST.pcie (100%) rename tests/data/acpi/{ => x86}/microvm/FACP (100%) rename tests/data/acpi/{ => x86}/pc/APIC (100%) rename tests/data/acpi/{ => x86}/pc/APIC.acpihmat (100%) rename tests/data/acpi/{ => x86}/pc/APIC.cphp (100%) rename tests/data/acpi/{ => x86}/pc/APIC.dimmpxm (100%) rename tests/data/acpi/{ => x86}/pc/DSDT (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.acpierst (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.acpihmat (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.bridge (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.cphp (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.dimmpxm (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.hpbridge (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.hpbrroot (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.ipmikcs (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.memhp (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.nohpet (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.numamem (100%) rename tests/data/acpi/{ => x86}/pc/DSDT.roothp (100%) rename tests/data/acpi/{ => x86}/pc/ERST.acpierst (100%) rename tests/data/acpi/{ => x86}/pc/FACP (100%) rename tests/data/acpi/{ => x86}/pc/FACP.nosmm (100%) rename tests/data/acpi/{ => x86}/pc/FACS (100%) rename tests/data/acpi/{ => x86}/pc/HMAT.acpihmat (100%) rename tests/data/acpi/{ => x86}/pc/HPET (100%) rename tests/data/acpi/{ => x86}/pc/NFIT.dimmpxm (100%) rename tests/data/acpi/{ => x86}/pc/SLIT.cphp (100%) rename tests/data/acpi/{ => x86}/pc/SLIT.memhp (100%) rename tests/data/acpi/{ => x86}/pc/SRAT.acpihmat (100%) rename tests/data/acpi/{ => x86}/pc/SRAT.cphp (100%) rename tests/data/acpi/{ => x86}/pc/SRAT.dimmpxm (100%) rename tests/data/acpi/{ => x86}/pc/SRAT.memhp (100%) rename tests/data/acpi/{ => x86}/pc/SRAT.numamem (100%) rename tests/data/acpi/{ => x86}/pc/SSDT.dimmpxm (100%) rename tests/data/acpi/{ => x86}/pc/WAET (100%) rename tests/data/acpi/{ => x86}/q35/APIC (100%) rename tests/data/acpi/{ => x86}/q35/APIC.acpihmat (100%) rename tests/data/acpi/{ => x86}/q35/APIC.acpihmat-noinitiator (100%) rename tests/data/acpi/{ => x86}/q35/APIC.core-count (100%) rename tests/data/acpi/{ => x86}/q35/APIC.core-count2 (100%) rename tests/data/acpi/{ => x86}/q35/APIC.cphp (100%) rename tests/data/acpi/{ => x86}/q35/APIC.dimmpxm (100%) rename tests/data/acpi/{ => x86}/q35/APIC.thread-count (100%) rename tests/data/acpi/{ => x86}/q35/APIC.thread-count2 (100%) rename tests/data/acpi/{ => x86}/q35/APIC.type4-count (100%) rename tests/data/acpi/{ => x86}/q35/APIC.xapic (100%) rename tests/data/acpi/{ => x86}/q35/CEDT.cxl (100%) rename tests/data/acpi/{ => x86}/q35/DMAR.dmar (100%) rename tests/data/acpi/{ => x86}/q35/DSDT (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.acpierst (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.acpihmat (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.acpihmat-noinitiator (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.applesmc (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.bridge (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.core-count (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.core-count2 (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.cphp (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.cxl (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.dimmpxm (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.ipmibt (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.ipmismbus (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.ivrs (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.memhp (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.mmio64 (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.multi-bridge (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.noacpihp (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.nohpet (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.numamem (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.pvpanic-isa (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.thread-count (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.thread-count2 (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm12 (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.tis.tpm2 (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.type4-count (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.viot (100%) rename tests/data/acpi/{ => x86}/q35/DSDT.xapic (100%) rename tests/data/acpi/{ => x86}/q35/ERST.acpierst (100%) rename tests/data/acpi/{ => x86}/q35/FACP (100%) rename tests/data/acpi/{ => x86}/q35/FACP.core-count (100%) rename tests/data/acpi/{ => x86}/q35/FACP.core-count2 (100%) rename tests/data/acpi/{ => x86}/q35/FACP.nosmm (100%) rename tests/data/acpi/{ => x86}/q35/FACP.slic (100%) rename tests/data/acpi/{ => x86}/q35/FACP.thread-count (100%) rename tests/data/acpi/{ => x86}/q35/FACP.thread-count2 (100%) rename tests/data/acpi/{ => x86}/q35/FACP.type4-count (100%) rename tests/data/acpi/{ => x86}/q35/FACP.xapic (100%) rename tests/data/acpi/{ => x86}/q35/FACS (100%) rename tests/data/acpi/{ => x86}/q35/HMAT.acpihmat (100%) rename tests/data/acpi/{ => x86}/q35/HMAT.acpihmat-noinitiator (100%) rename tests/data/acpi/{ => x86}/q35/HPET (100%) rename tests/data/acpi/{ => x86}/q35/IVRS.ivrs (100%) rename tests/data/acpi/{ => x86}/q35/MCFG (100%) rename tests/data/acpi/{ => x86}/q35/NFIT.dimmpxm (100%) rename tests/data/acpi/{ => x86}/q35/SLIC.slic (100%) rename tests/data/acpi/{ => x86}/q35/SLIT.cphp (100%) rename tests/data/acpi/{ => x86}/q35/SLIT.memhp (100%) rename tests/data/acpi/{ => x86}/q35/SRAT.acpihmat (100%) rename tests/data/acpi/{ => x86}/q35/SRAT.acpihmat-noinitiator (100%) rename tests/data/acpi/{ => x86}/q35/SRAT.cphp (100%) rename tests/data/acpi/{ => x86}/q35/SRAT.dimmpxm (100%) rename tests/data/acpi/{ => x86}/q35/SRAT.memhp (100%) rename tests/data/acpi/{ => x86}/q35/SRAT.mmio64 (100%) rename tests/data/acpi/{ => x86}/q35/SRAT.numamem (100%) rename tests/data/acpi/{ => x86}/q35/SRAT.xapic (100%) rename tests/data/acpi/{ => x86}/q35/SSDT.dimmpxm (100%) rename tests/data/acpi/{ => x86}/q35/TCPA.tis.tpm12 (100%) rename tests/data/acpi/{ => x86}/q35/TPM2.tis.tpm2 (100%) rename tests/data/acpi/{ => x86}/q35/VIOT.viot (100%) rename tests/data/acpi/{ => x86}/q35/WAET (100%)tests/data/acpi/x86/microvm/APIC renamed from tests/data/acpi/microvm/APIC +0
-0tests/data/acpi/x86/microvm/APIC.ioapic2 renamed from tests/data/acpi/microvm/APIC.ioapic2 +0
-0tests/data/acpi/x86/microvm/APIC.pcie renamed from tests/data/acpi/microvm/APIC.pcie +0
-0tests/data/acpi/x86/microvm/DSDT renamed from tests/data/acpi/microvm/DSDT +0
-0tests/data/acpi/x86/microvm/DSDT.ioapic2 renamed from tests/data/acpi/microvm/DSDT.ioapic2 +0
-0tests/data/acpi/x86/microvm/DSDT.pcie renamed from tests/data/acpi/microvm/DSDT.pcie +0
-0tests/data/acpi/x86/microvm/DSDT.rtc renamed from tests/data/acpi/microvm/DSDT.rtc +0
-0tests/data/acpi/x86/microvm/DSDT.usb renamed from tests/data/acpi/microvm/DSDT.usb +0
-0tests/data/acpi/x86/microvm/ERST.pcie renamed from tests/data/acpi/microvm/ERST.pcie +0
-0tests/data/acpi/x86/microvm/FACP renamed from tests/data/acpi/microvm/FACP +0
-0tests/data/acpi/x86/pc/APIC renamed from tests/data/acpi/pc/APIC +0
-0tests/data/acpi/x86/pc/APIC.acpihmat renamed from tests/data/acpi/pc/APIC.acpihmat +0
-0tests/data/acpi/x86/pc/APIC.cphp renamed from tests/data/acpi/pc/APIC.cphp +0
-0tests/data/acpi/x86/pc/APIC.dimmpxm renamed from tests/data/acpi/pc/APIC.dimmpxm +0
-0tests/data/acpi/x86/pc/DSDT renamed from tests/data/acpi/pc/DSDT +0
-0tests/data/acpi/x86/pc/DSDT.acpierst renamed from tests/data/acpi/pc/DSDT.acpierst +0
-0tests/data/acpi/x86/pc/DSDT.acpihmat renamed from tests/data/acpi/pc/DSDT.acpihmat +0
-0tests/data/acpi/x86/pc/DSDT.bridge renamed from tests/data/acpi/pc/DSDT.bridge +0
-0tests/data/acpi/x86/pc/DSDT.cphp renamed from tests/data/acpi/pc/DSDT.cphp +0
-0tests/data/acpi/x86/pc/DSDT.dimmpxm renamed from tests/data/acpi/pc/DSDT.dimmpxm +0
-0tests/data/acpi/x86/pc/DSDT.hpbridge renamed from tests/data/acpi/pc/DSDT.hpbridge +0
-0tests/data/acpi/x86/pc/DSDT.hpbrroot renamed from tests/data/acpi/pc/DSDT.hpbrroot +0
-0tests/data/acpi/x86/pc/DSDT.ipmikcs renamed from tests/data/acpi/pc/DSDT.ipmikcs +0
-0tests/data/acpi/x86/pc/DSDT.memhp renamed from tests/data/acpi/pc/DSDT.memhp +0
-0tests/data/acpi/x86/pc/DSDT.nohpet renamed from tests/data/acpi/pc/DSDT.nohpet +0
-0tests/data/acpi/x86/pc/DSDT.numamem renamed from tests/data/acpi/pc/DSDT.numamem +0
-0tests/data/acpi/x86/pc/DSDT.roothp renamed from tests/data/acpi/pc/DSDT.roothp +0
-0tests/data/acpi/x86/pc/ERST.acpierst renamed from tests/data/acpi/pc/ERST.acpierst +0
-0tests/data/acpi/x86/pc/FACP renamed from tests/data/acpi/pc/FACP +0
-0tests/data/acpi/x86/pc/FACP.nosmm renamed from tests/data/acpi/pc/FACP.nosmm +0
-0tests/data/acpi/x86/pc/FACS renamed from tests/data/acpi/pc/FACS +0
-0tests/data/acpi/x86/pc/HMAT.acpihmat renamed from tests/data/acpi/pc/HMAT.acpihmat +0
-0tests/data/acpi/x86/pc/HPET renamed from tests/data/acpi/pc/HPET +0
-0tests/data/acpi/x86/pc/NFIT.dimmpxm renamed from tests/data/acpi/pc/NFIT.dimmpxm +0
-0tests/data/acpi/x86/pc/SLIT.cphp renamed from tests/data/acpi/pc/SLIT.cphp +0
-0tests/data/acpi/x86/pc/SLIT.memhp renamed from tests/data/acpi/pc/SLIT.memhp +0
-0tests/data/acpi/x86/pc/SRAT.acpihmat renamed from tests/data/acpi/pc/SRAT.acpihmat +0
-0tests/data/acpi/x86/pc/SRAT.cphp renamed from tests/data/acpi/pc/SRAT.cphp +0
-0tests/data/acpi/x86/pc/SRAT.dimmpxm renamed from tests/data/acpi/pc/SRAT.dimmpxm +0
-0tests/data/acpi/x86/pc/SRAT.memhp renamed from tests/data/acpi/pc/SRAT.memhp +0
-0tests/data/acpi/x86/pc/SRAT.numamem renamed from tests/data/acpi/pc/SRAT.numamem +0
-0tests/data/acpi/x86/pc/SSDT.dimmpxm renamed from tests/data/acpi/pc/SSDT.dimmpxm +0
-0tests/data/acpi/x86/pc/WAET renamed from tests/data/acpi/pc/WAET +0
-0tests/data/acpi/x86/q35/APIC renamed from tests/data/acpi/q35/APIC +0
-0tests/data/acpi/x86/q35/APIC.acpihmat renamed from tests/data/acpi/q35/APIC.acpihmat +0
-0tests/data/acpi/x86/q35/APIC.acpihmat-noinitiator renamed from tests/data/acpi/q35/APIC.acpihmat-noinitiator +0
-0tests/data/acpi/x86/q35/APIC.core-count renamed from tests/data/acpi/q35/APIC.core-count +0
-0tests/data/acpi/x86/q35/APIC.core-count2 renamed from tests/data/acpi/q35/APIC.core-count2 +0
-0tests/data/acpi/x86/q35/APIC.cphp renamed from tests/data/acpi/q35/APIC.cphp +0
-0tests/data/acpi/x86/q35/APIC.dimmpxm renamed from tests/data/acpi/q35/APIC.dimmpxm +0
-0tests/data/acpi/x86/q35/APIC.thread-count renamed from tests/data/acpi/q35/APIC.thread-count +0
-0tests/data/acpi/x86/q35/APIC.thread-count2 renamed from tests/data/acpi/q35/APIC.thread-count2 +0
-0tests/data/acpi/x86/q35/APIC.type4-count renamed from tests/data/acpi/q35/APIC.type4-count +0
-0tests/data/acpi/x86/q35/APIC.xapic renamed from tests/data/acpi/q35/APIC.xapic +0
-0tests/data/acpi/x86/q35/CEDT.cxl renamed from tests/data/acpi/q35/CEDT.cxl +0
-0tests/data/acpi/x86/q35/DMAR.dmar renamed from tests/data/acpi/q35/DMAR.dmar +0
-0tests/data/acpi/x86/q35/DSDT renamed from tests/data/acpi/q35/DSDT +0
-0tests/data/acpi/x86/q35/DSDT.acpierst renamed from tests/data/acpi/q35/DSDT.acpierst +0
-0tests/data/acpi/x86/q35/DSDT.acpihmat renamed from tests/data/acpi/q35/DSDT.acpihmat +0
-0tests/data/acpi/x86/q35/DSDT.acpihmat-noinitiator renamed from tests/data/acpi/q35/DSDT.acpihmat-noinitiator +0
-0tests/data/acpi/x86/q35/DSDT.applesmc renamed from tests/data/acpi/q35/DSDT.applesmc +0
-0tests/data/acpi/x86/q35/DSDT.bridge renamed from tests/data/acpi/q35/DSDT.bridge +0
-0tests/data/acpi/x86/q35/DSDT.core-count renamed from tests/data/acpi/q35/DSDT.core-count +0
-0tests/data/acpi/x86/q35/DSDT.core-count2 renamed from tests/data/acpi/q35/DSDT.core-count2 +0
-0tests/data/acpi/x86/q35/DSDT.cphp renamed from tests/data/acpi/q35/DSDT.cphp +0
-0tests/data/acpi/x86/q35/DSDT.cxl renamed from tests/data/acpi/q35/DSDT.cxl +0
-0tests/data/acpi/x86/q35/DSDT.dimmpxm renamed from tests/data/acpi/q35/DSDT.dimmpxm +0
-0tests/data/acpi/x86/q35/DSDT.ipmibt renamed from tests/data/acpi/q35/DSDT.ipmibt +0
-0tests/data/acpi/x86/q35/DSDT.ipmismbus renamed from tests/data/acpi/q35/DSDT.ipmismbus +0
-0tests/data/acpi/x86/q35/DSDT.ivrs renamed from tests/data/acpi/q35/DSDT.ivrs +0
-0tests/data/acpi/x86/q35/DSDT.memhp renamed from tests/data/acpi/q35/DSDT.memhp +0
-0tests/data/acpi/x86/q35/DSDT.mmio64 renamed from tests/data/acpi/q35/DSDT.mmio64 +0
-0tests/data/acpi/x86/q35/DSDT.multi-bridge renamed from tests/data/acpi/q35/DSDT.multi-bridge +0
-0tests/data/acpi/x86/q35/DSDT.noacpihp renamed from tests/data/acpi/q35/DSDT.noacpihp +0
-0tests/data/acpi/x86/q35/DSDT.nohpet renamed from tests/data/acpi/q35/DSDT.nohpet +0
-0tests/data/acpi/x86/q35/DSDT.numamem renamed from tests/data/acpi/q35/DSDT.numamem +0
-0tests/data/acpi/x86/q35/DSDT.pvpanic-isa renamed from tests/data/acpi/q35/DSDT.pvpanic-isa +0
-0tests/data/acpi/x86/q35/DSDT.thread-count renamed from tests/data/acpi/q35/DSDT.thread-count +0
-0tests/data/acpi/x86/q35/DSDT.thread-count2 renamed from tests/data/acpi/q35/DSDT.thread-count2 +0
-0tests/data/acpi/x86/q35/DSDT.tis.tpm12 renamed from tests/data/acpi/q35/DSDT.tis.tpm12 +0
-0tests/data/acpi/x86/q35/DSDT.tis.tpm2 renamed from tests/data/acpi/q35/DSDT.tis.tpm2 +0
-0tests/data/acpi/x86/q35/DSDT.type4-count renamed from tests/data/acpi/q35/DSDT.type4-count +0
-0tests/data/acpi/x86/q35/DSDT.viot renamed from tests/data/acpi/q35/DSDT.viot +0
-0tests/data/acpi/x86/q35/DSDT.xapic renamed from tests/data/acpi/q35/DSDT.xapic +0
-0tests/data/acpi/x86/q35/ERST.acpierst renamed from tests/data/acpi/q35/ERST.acpierst +0
-0tests/data/acpi/x86/q35/FACP renamed from tests/data/acpi/q35/FACP +0
-0tests/data/acpi/x86/q35/FACP.core-count renamed from tests/data/acpi/q35/FACP.core-count +0
-0tests/data/acpi/x86/q35/FACP.core-count2 renamed from tests/data/acpi/q35/FACP.core-count2 +0
-0tests/data/acpi/x86/q35/FACP.nosmm renamed from tests/data/acpi/q35/FACP.nosmm +0
-0tests/data/acpi/x86/q35/FACP.slic renamed from tests/data/acpi/q35/FACP.slic +0
-0tests/data/acpi/x86/q35/FACP.thread-count renamed from tests/data/acpi/q35/FACP.thread-count +0
-0tests/data/acpi/x86/q35/FACP.thread-count2 renamed from tests/data/acpi/q35/FACP.thread-count2 +0
-0tests/data/acpi/x86/q35/FACP.type4-count renamed from tests/data/acpi/q35/FACP.type4-count +0
-0tests/data/acpi/x86/q35/FACP.xapic renamed from tests/data/acpi/q35/FACP.xapic +0
-0tests/data/acpi/x86/q35/FACS renamed from tests/data/acpi/q35/FACS +0
-0tests/data/acpi/x86/q35/HMAT.acpihmat renamed from tests/data/acpi/q35/HMAT.acpihmat +0
-0tests/data/acpi/x86/q35/HMAT.acpihmat-noinitiator renamed from tests/data/acpi/q35/HMAT.acpihmat-noinitiator +0
-0tests/data/acpi/x86/q35/HPET renamed from tests/data/acpi/q35/HPET +0
-0tests/data/acpi/x86/q35/IVRS.ivrs renamed from tests/data/acpi/q35/IVRS.ivrs +0
-0tests/data/acpi/x86/q35/MCFG renamed from tests/data/acpi/q35/MCFG +0
-0tests/data/acpi/x86/q35/NFIT.dimmpxm renamed from tests/data/acpi/q35/NFIT.dimmpxm +0
-0tests/data/acpi/x86/q35/SLIC.slic renamed from tests/data/acpi/q35/SLIC.slic +0
-0tests/data/acpi/x86/q35/SLIT.cphp renamed from tests/data/acpi/q35/SLIT.cphp +0
-0tests/data/acpi/x86/q35/SLIT.memhp renamed from tests/data/acpi/q35/SLIT.memhp +0
-0tests/data/acpi/x86/q35/SRAT.acpihmat renamed from tests/data/acpi/q35/SRAT.acpihmat +0
-0tests/data/acpi/x86/q35/SRAT.acpihmat-noinitiator renamed from tests/data/acpi/q35/SRAT.acpihmat-noinitiator +0
-0tests/data/acpi/x86/q35/SRAT.cphp renamed from tests/data/acpi/q35/SRAT.cphp +0
-0tests/data/acpi/x86/q35/SRAT.dimmpxm renamed from tests/data/acpi/q35/SRAT.dimmpxm +0
-0tests/data/acpi/x86/q35/SRAT.memhp renamed from tests/data/acpi/q35/SRAT.memhp +0
-0tests/data/acpi/x86/q35/SRAT.mmio64 renamed from tests/data/acpi/q35/SRAT.mmio64 +0
-0tests/data/acpi/x86/q35/SRAT.numamem renamed from tests/data/acpi/q35/SRAT.numamem +0
-0tests/data/acpi/x86/q35/SRAT.xapic renamed from tests/data/acpi/q35/SRAT.xapic +0
-0tests/data/acpi/x86/q35/SSDT.dimmpxm renamed from tests/data/acpi/q35/SSDT.dimmpxm +0
-0tests/data/acpi/x86/q35/TCPA.tis.tpm12 renamed from tests/data/acpi/q35/TCPA.tis.tpm12 +0
-0tests/data/acpi/x86/q35/TPM2.tis.tpm2 renamed from tests/data/acpi/q35/TPM2.tis.tpm2 +0
-0tests/data/acpi/x86/q35/VIOT.viot renamed from tests/data/acpi/q35/VIOT.viot +0
-0tests/data/acpi/x86/q35/WAET renamed from tests/data/acpi/q35/WAET +0
-0
PATCH v3 9/15 tests/data/acpi/virt: Move ARM64 ACPI tables under aarch64/${machine} path
In reply to Sunil V LSame machine name can be used by different architectures. Hence, create aarch64 folder and move all aarch64 related AML files for virt machine inside.
---
tests/data/acpi/{ => aarch64}/virt/APIC | Bin
.../data/acpi/{ => aarch64}/virt/APIC.acpihmatvirt | Bin
tests/data/acpi/{ => aarch64}/virt/APIC.topology | Bin
tests/data/acpi/{ => aarch64}/virt/DBG2 | Bin
tests/data/acpi/{ => aarch64}/virt/DSDT | Bin
.../data/acpi/{ => aarch64}/virt/DSDT.acpihmatvirt | Bin
tests/data/acpi/{ => aarch64}/virt/DSDT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/DSDT.pxb | Bin
tests/data/acpi/{ => aarch64}/virt/DSDT.topology | Bin
tests/data/acpi/{ => aarch64}/virt/FACP | Bin
tests/data/acpi/{ => aarch64}/virt/GTDT | Bin
.../data/acpi/{ => aarch64}/virt/HMAT.acpihmatvirt | Bin
tests/data/acpi/{ => aarch64}/virt/IORT | Bin
tests/data/acpi/{ => aarch64}/virt/MCFG | Bin
tests/data/acpi/{ => aarch64}/virt/NFIT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/PPTT | Bin
.../data/acpi/{ => aarch64}/virt/PPTT.acpihmatvirt | Bin
tests/data/acpi/{ => aarch64}/virt/PPTT.topology | Bin
tests/data/acpi/{ => aarch64}/virt/SLIT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/SPCR | Bin
.../data/acpi/{ => aarch64}/virt/SRAT.acpihmatvirt | Bin
tests/data/acpi/{ => aarch64}/virt/SRAT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/SRAT.numamem | Bin
tests/data/acpi/{ => aarch64}/virt/SSDT.memhp | Bin
tests/data/acpi/{ => aarch64}/virt/VIOT | Bin
25 files changed, 0 insertions(+), 0 deletions(-)
rename tests/data/acpi/{ => aarch64}/virt/APIC (100%)
rename tests/data/acpi/{ => aarch64}/virt/APIC.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/APIC.topology (100%)
rename tests/data/acpi/{ => aarch64}/virt/DBG2 (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT.pxb (100%)
rename tests/data/acpi/{ => aarch64}/virt/DSDT.topology (100%)
rename tests/data/acpi/{ => aarch64}/virt/FACP (100%)
rename tests/data/acpi/{ => aarch64}/virt/GTDT (100%)
rename tests/data/acpi/{ => aarch64}/virt/HMAT.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/IORT (100%)
rename tests/data/acpi/{ => aarch64}/virt/MCFG (100%)
rename tests/data/acpi/{ => aarch64}/virt/NFIT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/PPTT (100%)
rename tests/data/acpi/{ => aarch64}/virt/PPTT.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/PPTT.topology (100%)
rename tests/data/acpi/{ => aarch64}/virt/SLIT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/SPCR (100%)
rename tests/data/acpi/{ => aarch64}/virt/SRAT.acpihmatvirt (100%)
rename tests/data/acpi/{ => aarch64}/virt/SRAT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/SRAT.numamem (100%)
rename tests/data/acpi/{ => aarch64}/virt/SSDT.memhp (100%)
rename tests/data/acpi/{ => aarch64}/virt/VIOT (100%)tests/data/acpi/aarch64/virt/APIC renamed from tests/data/acpi/virt/APIC +0 -0
tests/data/acpi/aarch64/virt/APIC.acpihmatvirt renamed from tests/data/acpi/virt/APIC.acpihmatvirt +0 -0
tests/data/acpi/aarch64/virt/APIC.topology renamed from tests/data/acpi/virt/APIC.topology +0 -0
tests/data/acpi/aarch64/virt/DBG2 renamed from tests/data/acpi/virt/DBG2 +0 -0
tests/data/acpi/aarch64/virt/DSDT renamed from tests/data/acpi/virt/DSDT +0 -0
tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt renamed from tests/data/acpi/virt/DSDT.acpihmatvirt +0 -0
tests/data/acpi/aarch64/virt/DSDT.memhp renamed from tests/data/acpi/virt/DSDT.memhp +0 -0
tests/data/acpi/aarch64/virt/DSDT.pxb renamed from tests/data/acpi/virt/DSDT.pxb +0 -0
tests/data/acpi/aarch64/virt/DSDT.topology renamed from tests/data/acpi/virt/DSDT.topology +0 -0
tests/data/acpi/aarch64/virt/FACP renamed from tests/data/acpi/virt/FACP +0 -0
tests/data/acpi/aarch64/virt/GTDT renamed from tests/data/acpi/virt/GTDT +0 -0
tests/data/acpi/aarch64/virt/HMAT.acpihmatvirt renamed from tests/data/acpi/virt/HMAT.acpihmatvirt +0 -0
tests/data/acpi/aarch64/virt/IORT renamed from tests/data/acpi/virt/IORT +0 -0
tests/data/acpi/aarch64/virt/MCFG renamed from tests/data/acpi/virt/MCFG +0 -0
tests/data/acpi/aarch64/virt/NFIT.memhp renamed from tests/data/acpi/virt/NFIT.memhp +0 -0
tests/data/acpi/aarch64/virt/PPTT renamed from tests/data/acpi/virt/PPTT +0 -0
tests/data/acpi/aarch64/virt/PPTT.acpihmatvirt renamed from tests/data/acpi/virt/PPTT.acpihmatvirt +0 -0
tests/data/acpi/aarch64/virt/PPTT.topology renamed from tests/data/acpi/virt/PPTT.topology +0 -0
tests/data/acpi/aarch64/virt/SLIT.memhp renamed from tests/data/acpi/virt/SLIT.memhp +0 -0
tests/data/acpi/aarch64/virt/SPCR renamed from tests/data/acpi/virt/SPCR +0 -0
tests/data/acpi/aarch64/virt/SRAT.acpihmatvirt renamed from tests/data/acpi/virt/SRAT.acpihmatvirt +0 -0
tests/data/acpi/aarch64/virt/SRAT.memhp renamed from tests/data/acpi/virt/SRAT.memhp +0 -0
tests/data/acpi/aarch64/virt/SRAT.numamem renamed from tests/data/acpi/virt/SRAT.numamem +0 -0
tests/data/acpi/aarch64/virt/SSDT.memhp renamed from tests/data/acpi/virt/SSDT.memhp +0 -0
tests/data/acpi/aarch64/virt/VIOT renamed from tests/data/acpi/virt/VIOT +0 -0
Signature · 1 line
2.40.1
Re: [PATCH v3 09/15] tests/data/acpi/virt: Move ARM64 ACPI tables under aarch64/${machine} path
Quoted 5 lines · On Fri, 21 Jun 2024 17:29:00 +0530 Sunil V L <[email protected]> wrote:
Same machine name can be used by different architectures. Hence, create aarch64 folder and move all aarch64 related AML files for virt machine inside.
Signed-off-by Sunil V L <[email protected]>
Quoted 153 lines
--- tests/data/acpi/{ => aarch64}/virt/APIC | Bin .../data/acpi/{ => aarch64}/virt/APIC.acpihmatvirt | Bin tests/data/acpi/{ => aarch64}/virt/APIC.topology | Bin tests/data/acpi/{ => aarch64}/virt/DBG2 | Bin tests/data/acpi/{ => aarch64}/virt/DSDT | Bin .../data/acpi/{ => aarch64}/virt/DSDT.acpihmatvirt | Bin tests/data/acpi/{ => aarch64}/virt/DSDT.memhp | Bin tests/data/acpi/{ => aarch64}/virt/DSDT.pxb | Bin tests/data/acpi/{ => aarch64}/virt/DSDT.topology | Bin tests/data/acpi/{ => aarch64}/virt/FACP | Bin tests/data/acpi/{ => aarch64}/virt/GTDT | Bin .../data/acpi/{ => aarch64}/virt/HMAT.acpihmatvirt | Bin tests/data/acpi/{ => aarch64}/virt/IORT | Bin tests/data/acpi/{ => aarch64}/virt/MCFG | Bin tests/data/acpi/{ => aarch64}/virt/NFIT.memhp | Bin tests/data/acpi/{ => aarch64}/virt/PPTT | Bin .../data/acpi/{ => aarch64}/virt/PPTT.acpihmatvirt | Bin tests/data/acpi/{ => aarch64}/virt/PPTT.topology | Bin tests/data/acpi/{ => aarch64}/virt/SLIT.memhp | Bin tests/data/acpi/{ => aarch64}/virt/SPCR | Bin .../data/acpi/{ => aarch64}/virt/SRAT.acpihmatvirt | Bin tests/data/acpi/{ => aarch64}/virt/SRAT.memhp | Bin tests/data/acpi/{ => aarch64}/virt/SRAT.numamem | Bin tests/data/acpi/{ => aarch64}/virt/SSDT.memhp | Bin tests/data/acpi/{ => aarch64}/virt/VIOT | Bin 25 files changed, 0 insertions(+), 0 deletions(-) rename tests/data/acpi/{ => aarch64}/virt/APIC (100%) rename tests/data/acpi/{ => aarch64}/virt/APIC.acpihmatvirt (100%) rename tests/data/acpi/{ => aarch64}/virt/APIC.topology (100%) rename tests/data/acpi/{ => aarch64}/virt/DBG2 (100%) rename tests/data/acpi/{ => aarch64}/virt/DSDT (100%) rename tests/data/acpi/{ => aarch64}/virt/DSDT.acpihmatvirt (100%) rename tests/data/acpi/{ => aarch64}/virt/DSDT.memhp (100%) rename tests/data/acpi/{ => aarch64}/virt/DSDT.pxb (100%) rename tests/data/acpi/{ => aarch64}/virt/DSDT.topology (100%) rename tests/data/acpi/{ => aarch64}/virt/FACP (100%) rename tests/data/acpi/{ => aarch64}/virt/GTDT (100%) rename tests/data/acpi/{ => aarch64}/virt/HMAT.acpihmatvirt (100%) rename tests/data/acpi/{ => aarch64}/virt/IORT (100%) rename tests/data/acpi/{ => aarch64}/virt/MCFG (100%) rename tests/data/acpi/{ => aarch64}/virt/NFIT.memhp (100%) rename tests/data/acpi/{ => aarch64}/virt/PPTT (100%) rename tests/data/acpi/{ => aarch64}/virt/PPTT.acpihmatvirt (100%) rename tests/data/acpi/{ => aarch64}/virt/PPTT.topology (100%) rename tests/data/acpi/{ => aarch64}/virt/SLIT.memhp (100%) rename tests/data/acpi/{ => aarch64}/virt/SPCR (100%) rename tests/data/acpi/{ => aarch64}/virt/SRAT.acpihmatvirt (100%) rename tests/data/acpi/{ => aarch64}/virt/SRAT.memhp (100%) rename tests/data/acpi/{ => aarch64}/virt/SRAT.numamem (100%) rename tests/data/acpi/{ => aarch64}/virt/SSDT.memhp (100%) rename tests/data/acpi/{ => aarch64}/virt/VIOT (100%)tests/data/acpi/aarch64/virt/APIC renamed from tests/data/acpi/virt/APIC +0
-0tests/data/acpi/aarch64/virt/APIC.acpihmatvirt renamed from tests/data/acpi/virt/APIC.acpihmatvirt +0
-0tests/data/acpi/aarch64/virt/APIC.topology renamed from tests/data/acpi/virt/APIC.topology +0
-0tests/data/acpi/aarch64/virt/DBG2 renamed from tests/data/acpi/virt/DBG2 +0
-0tests/data/acpi/aarch64/virt/DSDT renamed from tests/data/acpi/virt/DSDT +0
-0tests/data/acpi/aarch64/virt/DSDT.acpihmatvirt renamed from tests/data/acpi/virt/DSDT.acpihmatvirt +0
-0tests/data/acpi/aarch64/virt/DSDT.memhp renamed from tests/data/acpi/virt/DSDT.memhp +0
-0tests/data/acpi/aarch64/virt/DSDT.pxb renamed from tests/data/acpi/virt/DSDT.pxb +0
-0tests/data/acpi/aarch64/virt/DSDT.topology renamed from tests/data/acpi/virt/DSDT.topology +0
-0tests/data/acpi/aarch64/virt/FACP renamed from tests/data/acpi/virt/FACP +0
-0tests/data/acpi/aarch64/virt/GTDT renamed from tests/data/acpi/virt/GTDT +0
-0tests/data/acpi/aarch64/virt/HMAT.acpihmatvirt renamed from tests/data/acpi/virt/HMAT.acpihmatvirt +0
-0tests/data/acpi/aarch64/virt/IORT renamed from tests/data/acpi/virt/IORT +0
-0tests/data/acpi/aarch64/virt/MCFG renamed from tests/data/acpi/virt/MCFG +0
-0tests/data/acpi/aarch64/virt/NFIT.memhp renamed from tests/data/acpi/virt/NFIT.memhp +0
-0tests/data/acpi/aarch64/virt/PPTT renamed from tests/data/acpi/virt/PPTT +0
-0tests/data/acpi/aarch64/virt/PPTT.acpihmatvirt renamed from tests/data/acpi/virt/PPTT.acpihmatvirt +0
-0tests/data/acpi/aarch64/virt/PPTT.topology renamed from tests/data/acpi/virt/PPTT.topology +0
-0tests/data/acpi/aarch64/virt/SLIT.memhp renamed from tests/data/acpi/virt/SLIT.memhp +0
-0tests/data/acpi/aarch64/virt/SPCR renamed from tests/data/acpi/virt/SPCR +0
-0tests/data/acpi/aarch64/virt/SRAT.acpihmatvirt renamed from tests/data/acpi/virt/SRAT.acpihmatvirt +0
-0tests/data/acpi/aarch64/virt/SRAT.memhp renamed from tests/data/acpi/virt/SRAT.memhp +0
-0tests/data/acpi/aarch64/virt/SRAT.numamem renamed from tests/data/acpi/virt/SRAT.numamem +0
-0tests/data/acpi/aarch64/virt/SSDT.memhp renamed from tests/data/acpi/virt/SSDT.memhp +0
-0tests/data/acpi/aarch64/virt/VIOT renamed from tests/data/acpi/virt/VIOT +0
-0
PATCH v3 10/15 meson.build: Add RISC-V to the edk2-target list
In reply to Sunil V Lso that ACPI table test can be supported.
--- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
@@ -93,7 +93,7 @@ else iasl = find_program(get_option('iasl'), required: true) endif -edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ] +edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu', 'riscv64-softmmu' ] unpack_edk2_blobs = false foreach target : edk2_targets if target in target_dirs
Signature · 1 line
2.40.1
PATCH v3 11/15 pc-bios/meson.build: Add support for RISC-V in unpack_edk2_blobs
In reply to Sunil V LUpdate list of images supported in unpack_edk2_blobs to enable RISC-V ACPI table testing.
--- pc-bios/meson.build | 2 ++ tests/qtest/meson.build | 3 +++ 2 files changed, 5 insertions(+)
pc-bios/meson.build +2 -0
@@ -4,6 +4,8 @@ if unpack_edk2_blobs 'edk2-aarch64-code.fd', 'edk2-arm-code.fd', 'edk2-arm-vars.fd', + 'edk2-riscv-code.fd', + 'edk2-riscv-vars.fd', 'edk2-i386-code.fd', 'edk2-i386-secure-code.fd', 'edk2-i386-vars.fd',
tests/qtest/meson.build +3 -0
@@ -259,6 +259,9 @@ qtests_s390x = \ qtests_riscv32 = \ (config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : []) +qtests_riscv64 = \ + (unpack_edk2_blobs ? ['bios-tables-test'] : []) + qos_test_ss = ss.source_set() qos_test_ss.add( 'ac97-test.c',
Signature · 1 line
2.40.1
PATCH v3 12/15 tests/data/acpi/rebuild-expected-aml.sh: Add RISC-V
In reply to Sunil V LUpdate the list of supported architectures to include RISC-V.
--- tests/data/acpi/rebuild-expected-aml.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tests/data/acpi/rebuild-expected-aml.sh +3 -2
@@ -12,7 +12,7 @@ # This work is licensed under the terms of the GNU GPLv2. # See the COPYING.LIB file in the top-level directory. -qemu_arches="x86_64 aarch64" +qemu_arches="x86_64 aarch64 riscv64" if [ ! -e "tests/qtest/bios-tables-test" ]; then echo "Test: bios-tables-test is required! Run make check before this script."
@@ -36,7 +36,8 @@ fi if [ -z "$qemu_bins" ]; then echo "Only the following architectures are currently supported: $qemu_arches" echo "None of these configured!" - echo "To fix, run configure --target-list=x86_64-softmmu,aarch64-softmmu" + echo "To fix, run configure \ + --target-list=x86_64-softmmu,aarch64-softmmu,riscv64-softmmu" exit 1; fi
Signature · 1 line
2.40.1
PATCH v3 13/15 tests/qtest/bios-tables-test: Add empty ACPI data files for RISC-V
In reply to Sunil V LAs per process documented (steps 1-3) in bios-tables-test.c, add empty AML data files for RISC-V ACPI tables and add the entries in bios-tables-test-allowed-diff.h.
--- tests/data/acpi/riscv64/virt/APIC | 0 tests/data/acpi/riscv64/virt/DSDT | 0 tests/data/acpi/riscv64/virt/FACP | 0 tests/data/acpi/riscv64/virt/MCFG | 0 tests/data/acpi/riscv64/virt/RHCT | 0 tests/data/acpi/riscv64/virt/SPCR | 0 tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++ 7 files changed, 6 insertions(+) create mode 100644 tests/data/acpi/riscv64/virt/APIC create mode 100644 tests/data/acpi/riscv64/virt/DSDT create mode 100644 tests/data/acpi/riscv64/virt/FACP create mode 100644 tests/data/acpi/riscv64/virt/MCFG create mode 100644 tests/data/acpi/riscv64/virt/RHCT create mode 100644 tests/data/acpi/riscv64/virt/SPCR
tests/data/acpi/riscv64/virt/APIC new file +0 -0
tests/data/acpi/riscv64/virt/DSDT new file +0 -0
tests/data/acpi/riscv64/virt/FACP new file +0 -0
tests/data/acpi/riscv64/virt/MCFG new file +0 -0
tests/data/acpi/riscv64/virt/RHCT new file +0 -0
tests/data/acpi/riscv64/virt/SPCR new file +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +6 -0
@@ -1 +1,7 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/riscv64/virt/APIC" , +"tests/data/acpi/riscv64/virt/DSDT" , +"tests/data/acpi/riscv64/virt/FACP" , +"tests/data/acpi/riscv64/virt/MCFG" , +"tests/data/acpi/riscv64/virt/RHCT" , +"tests/data/acpi/riscv64/virt/SPCR",
Signature · 1 line
2.40.1
PATCH v3 14/15 tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
In reply to Sunil V LAdd basic ACPI table test case for RISC-V.
--- tests/qtest/bios-tables-test.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
tests/qtest/bios-tables-test.c +26 -0
@@ -1977,6 +1977,28 @@ static void test_acpi_microvm_acpi_erst(void) }#endif /* CONFIG_POSIX */ +static void test_acpi_riscv64_virt_tcg (void ) +{ +test_data data = { + .machine ="virt" , + .arch ="riscv64" , + .tcg_only = true, + .uefi_fl1 ="pc-bios/edk2-riscv-code.fd" , + .uefi_fl2 ="pc-bios/edk2-riscv-vars.fd" , + .cd ="tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2" , + .ram_start =0x80000000ULL , + .scan_len =128ULL *1024 *1024 , + }; + +/* +* RHCT will have ISA string encoded. To reduce the effort +* of updating expected AML file for any new default ISA extension, +* use the profile rva22s64. +*/ +test_acpi_one ("-cpu rva22s64 " , &data); +free_test_data (&data); +} +static void test_acpi_aarch64_virt_tcg (void ) {test_data data = {
@@ -2455,6 +2477,10 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/virt/viot" , test_acpi_aarch64_virt_viot); } } + }else if (strcmp (arch,"riscv64" ) ==0 ) { +if (has_tcg &&qtest_has_device ("virtio-blk-pci" )) { +qtest_add_func ("acpi/virt" , test_acpi_riscv64_virt_tcg); + } } ret =g_test_run ();boot_sector_cleanup (disk);
Signature · 1 line
2.40.1
Re: [PATCH v3 14/15] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
Quoted 4 lines · On Fri, 21 Jun 2024 17:29:05 +0530 Sunil V L <[email protected]> wrote:
Add basic ACPI table test case for RISC-V.
Signed-off-by Sunil V L <[email protected]>Reviewed-by Alistair Francis <[email protected]>
Quoted 48 lines
--- tests/qtest/bios-tables-test.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)tests/qtest/bios-tables-test.c +26
-0@@ -1977,6 +1977,28 @@ static void test_acpi_microvm_acpi_erst(void) }#endif /* CONFIG_POSIX */ +static void test_acpi_riscv64_virt_tcg (void ) +{ +test_data data = { + .machine ="virt" , + .arch ="riscv64" , + .tcg_only = true, + .uefi_fl1 ="pc-bios/edk2-riscv-code.fd" , + .uefi_fl2 ="pc-bios/edk2-riscv-vars.fd" , + .cd ="tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2" , + .ram_start =0x80000000ULL , + .scan_len =128ULL *1024 *1024 , + }; + +/* +* RHCT will have ISA string encoded. To reduce the effort +* of updating expected AML file for any new default ISA extension, +* use the profile rva22s64. +*/ +test_acpi_one ("-cpu rva22s64 " , &data); +free_test_data (&data); +} +static void test_acpi_aarch64_virt_tcg (void ) {test_data data = {@@ -2455,6 +2477,10 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/virt/viot" , test_acpi_aarch64_virt_viot); } } + }else if (strcmp (arch,"riscv64" ) ==0 ) { +if (has_tcg &&qtest_has_device ("virtio-blk-pci" )) { +qtest_add_func ("acpi/virt" , test_acpi_riscv64_virt_tcg); + } } ret =g_test_run ();boot_sector_cleanup (disk);
Re: [PATCH v3 14/15] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
Quoted 9 lines · On Tue, 25 Jun 2024 13:19:59 +0200 Igor Mammedov <[email protected]> wrote:
Quoted 4 lines · On Fri, 21 Jun 2024 17:29:05 +0530 Sunil V L <[email protected]> wrote:
Add basic ACPI table test case for RISC-V.
Signed-off-by Sunil V L <[email protected]>Reviewed-by Alistair Francis <[email protected]>Reviewed-by Igor Mammedov <[email protected]>
I take ack back for now, since patch most likely to cause failures on weaker test host (CI infra)
test case never finishes and timeouts on my x86 host while consuming 100%,
======
QTEST_QEMU_BINARY=./qemu-system-riscv64 /tmp/qemu_build/tests/qtest/bios-tables-test
# random seed: R02Sd870403ff62b08e48122105b2700f660 # starting QEMU: exec ./qemu-system-riscv64 -qtest unix:/tmp/qtest-2873960.sock -qtest-log /dev/null -chardev socket,path=/tmp/qtest-2873960.qmp,id=char0 -mon chardev=char0,mode=control -display none -audio none -machine none -accel qtest 1..1 # Start of riscv64 tests # Start of acpi tests # starting QEMU: exec ./qemu-system-riscv64 -qtest unix:/tmp/qtest-2873960.sock -qtest-log /dev/null -chardev socket,path=/tmp/qtest-2873960.qmp,id=char0 -mon chardev=char0,mode=control -display none -audio none -machine virt -accel tcg -nodefaults -nographic -drive if=pflash,format=raw,file=pc-bios/edk2-riscv-code.fd,readonly=on -drive if=pflash,format=raw,file=pc-bios/edk2-riscv-vars.fd,snapshot=on -cdrom tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2 -cpu rva22s64 -accel qtest
**
ERROR:../../builds/imammedo/qemu/tests/qtest/acpi-utils.c:158:acpi_find_rsdp_address_uefi: code should not be reached Bail out! ERROR:../../builds/imammedo/qemu/tests/qtest/acpi-utils.c:158:acpi_find_rsdp_address_uefi: code should not be reached
========
Quoted 50 lines
Quoted 49 lines
--- tests/qtest/bios-tables-test.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)tests/qtest/bios-tables-test.c +26
-0@@ -1977,6 +1977,28 @@ static void test_acpi_microvm_acpi_erst(void) }#endif /* CONFIG_POSIX */ +static void test_acpi_riscv64_virt_tcg (void ) +{ +test_data data = { + .machine ="virt" , + .arch ="riscv64" , + .tcg_only = true, + .uefi_fl1 ="pc-bios/edk2-riscv-code.fd" , + .uefi_fl2 ="pc-bios/edk2-riscv-vars.fd" , + .cd ="tests/data/uefi-boot-images/bios-tables-test.riscv64.iso.qcow2" , + .ram_start =0x80000000ULL , + .scan_len =128ULL *1024 *1024 , + }; + +/* +* RHCT will have ISA string encoded. To reduce the effort +* of updating expected AML file for any new default ISA extension, +* use the profile rva22s64. +*/ +test_acpi_one ("-cpu rva22s64 " , &data); +free_test_data (&data); +} +static void test_acpi_aarch64_virt_tcg (void ) {test_data data = {@@ -2455,6 +2477,10 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/virt/viot" , test_acpi_aarch64_virt_viot); } } + }else if (strcmp (arch,"riscv64" ) ==0 ) { +if (has_tcg &&qtest_has_device ("virtio-blk-pci" )) { +qtest_add_func ("acpi/virt" , test_acpi_riscv64_virt_tcg); + } } ret =g_test_run ();boot_sector_cleanup (disk);
Re: [PATCH v3 14/15] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
Quoted 8 lines · Igor Mammedov
Quoted 5 lines · On Tue, 25 Jun 2024 13:19:59 +0200 Igor Mammedov <[email protected]> wrote:
Quoted 2 lines · On Fri, 21 Jun 2024 17:29:05 +0530 Sunil V L <[email protected]> wrote:
Add basic ACPI table test case for RISC-V.
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Sunil V L <[email protected]>Reviewed-by Alistair Francis <[email protected]>Reviewed-by Igor Mammedov <[email protected]>I take ack back for now, since patch most likely to cause failures on weaker test host (CI infra)
test case never finishes and timeouts on my x86 host while consuming 100%,
Hi Igor,
Many thanks for your kind review!. I think you are missing the patch [1] (which I mentioned in cover letter as well). This patch became a dependency since your suggestion to use -cdrom option needed this fix.
gitlab CI tests also passed for me with that patch included.
[1] - https://mail.gnu.org/archive/html/qemu-devel/2024-06/msg03683.html
Thanks,
Sunil
Re: [PATCH v3 14/15] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
Quoted 20 lines · On Tue, 25 Jun 2024 17:59:33 +0530 Sunil V L <[email protected]> wrote:
Quoted 8 lines · Igor Mammedov
Quoted 5 lines · On Tue, 25 Jun 2024 13:19:59 +0200 Igor Mammedov <[email protected]> wrote:
Quoted 2 lines · On Fri, 21 Jun 2024 17:29:05 +0530 Sunil V L <[email protected]> wrote:
Add basic ACPI table test case for RISC-V.
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Sunil V L <[email protected]>Reviewed-by Alistair Francis <[email protected]>Reviewed-by Igor Mammedov <[email protected]>I take ack back for now, since patch most likely to cause failures on weaker test host (CI infra)
test case never finishes and timeouts on my x86 host while consuming 100%,
Hi Igor,
Quoted 7 lines
Many thanks for your kind review!. I think you are missing the patch [1] (which I mentioned in cover letter as well). This patch became a dependency since your suggestion to use -cdrom option needed this fix.
gitlab CI tests also passed for me with that patch included.
[1] - https://mail.gnu.org/archive/html/qemu-devel/2024-06/msg03683.html
ok, keep my RB but respin series with that patch included to make it complete. (there is no harm if it gets merged 1st through another tree. but it makes life of reviewers/maintainers easier)
Quoted 4 lines
Thanks,
Sunil
Re: [PATCH v3 14/15] tests/qtest/bios-tables-test.c: Enable basic testing for RISC-V
Quoted 27 lines · Igor Mammedov
Quoted 24 lines · On Tue, 25 Jun 2024 17:59:33 +0530 Sunil V L <[email protected]> wrote:
Quoted 8 lines · Igor Mammedov
Quoted 5 lines · On Tue, 25 Jun 2024 13:19:59 +0200 Igor Mammedov <[email protected]> wrote:
Quoted 2 lines · On Fri, 21 Jun 2024 17:29:05 +0530 Sunil V L <[email protected]> wrote:
Add basic ACPI table test case for RISC-V.
Quoted 9 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Sunil V L <[email protected]>Reviewed-by Alistair Francis <[email protected]>Reviewed-by Igor Mammedov <[email protected]>I take ack back for now, since patch most likely to cause failures on weaker test host (CI infra)
test case never finishes and timeouts on my x86 host while consuming 100%,
Hi Igor,
Many thanks for your kind review!. I think you are missing the patch [1] (which I mentioned in cover letter as well). This patch became a dependency since your suggestion to use -cdrom option needed this fix.
Quoted 8 lines
Quoted 3 lines
gitlab CI tests also passed for me with that patch included.
[1] - https://mail.gnu.org/archive/html/qemu-devel/2024-06/msg03683.html
ok, keep my RB but respin series with that patch included to make it complete. (there is no harm if it gets merged 1st through another tree. but it makes life of reviewers/maintainers easier)
Fair enough. Sorry about that. I have sent v4 as per your recommendation. It looks like the series has got sufficient reviews. May be it would be better if it goes via Alistair's tree since the dependent patch is already merged in his next branch but I will leave it to the maintainers.
Thanks!
Sunil
PATCH v3 15/15 tests/qtest/bios-tables-test: Add expected ACPI data files for RISC-V
In reply to Sunil V LAs per the step 5 in the process documented in bios-tables-test.c, generate the expected ACPI AML data files for RISC-V using the rebuild-expected-aml.sh script and update the bios-tables-test-allowed-diff.h.
These are all new files being added for the first time. Hence, iASL diff output is not added.
--- tests/data/acpi/riscv64/virt/APIC | Bin 0 -> 116 bytes tests/data/acpi/riscv64/virt/DSDT | Bin 0 -> 3518 bytes tests/data/acpi/riscv64/virt/FACP | Bin 0 -> 276 bytes tests/data/acpi/riscv64/virt/MCFG | Bin 0 -> 60 bytes tests/data/acpi/riscv64/virt/RHCT | Bin 0 -> 314 bytes tests/data/acpi/riscv64/virt/SPCR | Bin 0 -> 80 bytes tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ 7 files changed, 6 deletions(-)
tests/data/acpi/riscv64/virt/APIC binary +0 -0
tests/data/acpi/riscv64/virt/DSDT binary +0 -0
tests/data/acpi/riscv64/virt/FACP binary +0 -0
tests/data/acpi/riscv64/virt/MCFG binary +0 -0
tests/data/acpi/riscv64/virt/RHCT binary +0 -0
tests/data/acpi/riscv64/virt/SPCR binary +0 -0
tests/qtest/bios-tables-test-allowed-diff.h +0 -6
@@ -1,7 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/riscv64/virt/APIC" , -"tests/data/acpi/riscv64/virt/DSDT" , -"tests/data/acpi/riscv64/virt/FACP" , -"tests/data/acpi/riscv64/virt/MCFG" , -"tests/data/acpi/riscv64/virt/RHCT" , -"tests/data/acpi/riscv64/virt/SPCR",
Signature · 1 line
2.40.1