[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/18] tests/qtest/readconfig-test: Check for the availability of
From: |
Thomas Huth |
Subject: |
[PATCH 11/18] tests/qtest/readconfig-test: Check for the availability of USB controllers |
Date: |
Fri, 12 May 2023 14:40:26 +0200 |
The USB controllers might not be available in the QEMU binary
(e.g. when using the "--without-default-devices" configure switch),
so we have to check whether the devices can be used before running
the related test.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/readconfig-test.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c
index 918d45684b..ac7242451b 100644
--- a/tests/qtest/readconfig-test.c
+++ b/tests/qtest/readconfig-test.c
@@ -207,7 +207,10 @@ int main(int argc, char *argv[])
if (g_str_equal(arch, "i386") ||
g_str_equal(arch, "x86_64")) {
qtest_add_func("readconfig/x86/memdev", test_x86_memdev);
- qtest_add_func("readconfig/x86/ich9-ehci-uhci", test_docs_config_ich9);
+ if (qtest_has_device("ich9-usb-ehci1") &&
+ qtest_has_device("ich9-usb-uhci1")) {
+ qtest_add_func("readconfig/x86/ich9-ehci-uhci",
test_docs_config_ich9);
+ }
}
#if defined(CONFIG_SPICE) && !defined(__FreeBSD__)
qtest_add_func("readconfig/spice", test_spice);
--
2.31.1
- [PATCH 02/18] softmmu/vl.c: Check for the availability of the VGA device before using it, (continued)
- [PATCH 02/18] softmmu/vl.c: Check for the availability of the VGA device before using it, Thomas Huth, 2023/05/12
- [PATCH 01/18] hw/i386/Kconfig: ISAPC works fine without VGA_ISA, Thomas Huth, 2023/05/12
- [PATCH 05/18] hw/ppc: Use MachineClass->default_nic in the ppc machines, Thomas Huth, 2023/05/12
- [PATCH 04/18] softmmu/vl.c: Disable default NIC if it has not been compiled into the binary, Thomas Huth, 2023/05/12
- [PATCH 07/18] hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine, Thomas Huth, 2023/05/12
- [PATCH 03/18] hw: Move the default NIC machine class setting from the x86 to the generic one, Thomas Huth, 2023/05/12
- [PATCH 08/18] hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file, Thomas Huth, 2023/05/12
- [PATCH 06/18] hw/s390x: Use MachineClass->default_nic in the s390x machine, Thomas Huth, 2023/05/12
- [PATCH 09/18] hw/i386: Ignore the default parallel port if it has not been compiled into QEMU, Thomas Huth, 2023/05/12
- [PATCH 10/18] hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel, Thomas Huth, 2023/05/12
- [PATCH 11/18] tests/qtest/readconfig-test: Check for the availability of USB controllers,
Thomas Huth <=
- [PATCH 12/18] tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available, Thomas Huth, 2023/05/12
- [PATCH 15/18] tests/qtest: Check for the availability of virtio-ccw devices before using them, Thomas Huth, 2023/05/12
- [PATCH 13/18] tests/qtest/cdrom-test: Fix the test to also work without optional devices, Thomas Huth, 2023/05/12
- [PATCH 14/18] tests/qtest/virtio-ccw-test: Remove superfluous tests, Thomas Huth, 2023/05/12
- [PATCH 16/18] tests/qtest/meson.build: Run the net filter tests only with default devices, Thomas Huth, 2023/05/12
- [PATCH 18/18] .gitlab-ci.d/buildtest.yml: Run full "make check" with --without-default-devices, Thomas Huth, 2023/05/12
- [PATCH 17/18] tests/qemu-iotests/172: Run QEMU with -vga none and -nic none, Thomas Huth, 2023/05/12