From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 11/20] tests/qtest/readconfig-test: Check for the availability of USB controllers
Date: Mon, 22 May 2023 13:50:05 +0200 [thread overview]
Message-ID: <20230522115014.1110840-12-thuth@redhat.com> (raw)
In-Reply-To: <20230522115014.1110840-1-thuth@redhat.com>
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.
Message-Id: <20230512124033.502654-12-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
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
next prev parent reply other threads:[~2023-05-22 11:51 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 11:49 [PULL 00/20] Allow "make check" with "--without-default-devices" Thomas Huth
2023-05-22 11:49 ` [PULL 01/20] hw/i386/Kconfig: ISAPC works fine without VGA_ISA Thomas Huth
2023-05-22 11:49 ` [PULL 02/20] softmmu/vl.c: Check for the availability of the VGA device before using it Thomas Huth
2023-05-22 11:49 ` [PULL 03/20] hw: Move the default NIC machine class setting from the x86 to the generic one Thomas Huth
2023-05-22 11:49 ` [PULL 04/20] softmmu/vl.c: Disable default NIC if it has not been compiled into the binary Thomas Huth
2023-05-22 11:49 ` [PULL 05/20] hw/ppc: Use MachineClass->default_nic in the ppc machines Thomas Huth
2023-05-22 11:50 ` [PULL 06/20] hw/s390x: Use MachineClass->default_nic in the s390x machine Thomas Huth
2023-05-22 11:50 ` [PULL 07/20] hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine Thomas Huth
2023-05-22 11:50 ` [PULL 08/20] hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file Thomas Huth
2023-05-22 11:50 ` [PULL 09/20] hw/i386: Ignore the default parallel port if it has not been compiled into QEMU Thomas Huth
2023-05-22 11:50 ` [PULL 10/20] hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel Thomas Huth
2023-05-22 11:50 ` Thomas Huth [this message]
2023-05-22 11:50 ` [PULL 12/20] tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available Thomas Huth
2023-05-22 11:50 ` [PULL 13/20] tests/qtest/cdrom-test: Fix the test to also work without optional devices Thomas Huth
2023-05-22 11:50 ` [PULL 14/20] tests/qtest/virtio-ccw-test: Remove superfluous tests Thomas Huth
2023-05-22 11:50 ` [PULL 15/20] tests/qtest: Check for the availability of virtio-ccw devices before using them Thomas Huth
2023-05-22 11:50 ` [PULL 16/20] tests/qtest/meson.build: Run the net filter tests only with default devices Thomas Huth
2023-05-22 11:50 ` [PULL 17/20] tests/qemu-iotests/172: Run QEMU with -vga none and -nic none Thomas Huth
2023-05-22 11:50 ` [PULL 18/20] .gitlab-ci.d/buildtest.yml: Run full "make check" with --without-default-devices Thomas Huth
2023-05-22 11:50 ` [PULL 19/20] acpi/tests/avocado/bits: enable bios bits avocado tests on gitlab CI pipeline Thomas Huth
2023-05-22 11:50 ` [PULL 20/20] memory: stricter checks prior to unsetting engaged_in_io Thomas Huth
2023-05-22 22:20 ` [PULL 00/20] Allow "make check" with "--without-default-devices" Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230522115014.1110840-12-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).