tests/qtest/bios-tables-test: Check for virtio-iommu device before using it
PATCH 1/1 tests/qtest/bios-tables-test: Check for virtio-iommu device before using it
The virtio-iommu device might be missing in the QEMU binary (e.g. in downstream RHEL builds), so let's better check for its availability first before using it.
Signed-off-by Thomas Huth <[email protected]>
--- tests/qtest/bios-tables-test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
tests/qtest/bios-tables-test.c +6 -2
@@ -2138,7 +2138,9 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/q35/core-count2" , test_acpi_q35_tcg_core_count2); } -qtest_add_func ("acpi/q35/viot" , test_acpi_q35_viot); +if (qtest_has_device ("virtio-iommu-pci" )) { +qtest_add_func ("acpi/q35/viot" , test_acpi_q35_viot); + }#ifdef CONFIG_POSIX qtest_add_func ("acpi/q35/cxl" , test_acpi_q35_cxl);#endif
@@ -2173,7 +2175,9 @@ int main(int argc, char *argv[])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); -qtest_add_func ("acpi/virt/viot" , test_acpi_virt_viot); +if (qtest_has_device ("virtio-iommu-pci" )) { +qtest_add_func ("acpi/virt/viot" , test_acpi_virt_viot); + } } } ret =g_test_run ();
Signature · 1 line
2.39.3
Quoted 5 lines · On Tue, 22 Aug 2023 18:49:48 +0200 Thomas Huth <[email protected]> wrote:
The virtio-iommu device might be missing in the QEMU binary (e.g. in downstream RHEL builds), so let's better check for its availability first before using it.
Signed-off-by Thomas Huth <[email protected]>
Acked-by Igor Mammedov <[email protected]>
Quoted 30 lines
--- tests/qtest/bios-tables-test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)tests/qtest/bios-tables-test.c +6
-2@@ -2138,7 +2138,9 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/q35/core-count2" , test_acpi_q35_tcg_core_count2); } -qtest_add_func ("acpi/q35/viot" , test_acpi_q35_viot); +if (qtest_has_device ("virtio-iommu-pci" )) { +qtest_add_func ("acpi/q35/viot" , test_acpi_q35_viot); + }#ifdef CONFIG_POSIX qtest_add_func ("acpi/q35/cxl" , test_acpi_q35_cxl);#endif @@ -2173,7 +2175,9 @@ int main(int argc, char *argv[])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); -qtest_add_func ("acpi/virt/viot" , test_acpi_virt_viot); +if (qtest_has_device ("virtio-iommu-pci" )) { +qtest_add_func ("acpi/virt/viot" , test_acpi_virt_viot); + } } } ret =g_test_run ();