* [PATCH] tests/qtest/bios-tables-test: Check for virtio-iommu device before using it
@ 2023-08-22 16:49 Thomas Huth
2023-08-29 10:20 ` Igor Mammedov
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Huth @ 2023-08-22 16:49 UTC (permalink / raw)
To: qemu-devel, Michael S. Tsirkin, Igor Mammedov; +Cc: Ani Sinha
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 <thuth@redhat.com>
---
tests/qtest/bios-tables-test.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 47ba20b957..dd06e6300a 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -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();
--
2.39.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tests/qtest/bios-tables-test: Check for virtio-iommu device before using it
2023-08-22 16:49 [PATCH] tests/qtest/bios-tables-test: Check for virtio-iommu device before using it Thomas Huth
@ 2023-08-29 10:20 ` Igor Mammedov
0 siblings, 0 replies; 2+ messages in thread
From: Igor Mammedov @ 2023-08-29 10:20 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, Michael S. Tsirkin, Ani Sinha
On Tue, 22 Aug 2023 18:49:48 +0200
Thomas Huth <thuth@redhat.com> 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 <thuth@redhat.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
> ---
> tests/qtest/bios-tables-test.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
> index 47ba20b957..dd06e6300a 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -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();
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-29 10:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-22 16:49 [PATCH] tests/qtest/bios-tables-test: Check for virtio-iommu device before using it Thomas Huth
2023-08-29 10:20 ` Igor Mammedov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).