From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Laurent Vivier <lvivier@redhat.com>,
Fabiano Rosas <farosas@suse.de>
Cc: Ani Sinha <anisinha@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
John Snow <jsnow@redhat.com>
Subject: [PATCH 3/4] tests/qtest/rtl8139-test: Check whether the rtl8139 device is available
Date: Thu, 25 May 2023 10:10:15 +0200 [thread overview]
Message-ID: <20230525081016.1870364-4-thuth@redhat.com> (raw)
In-Reply-To: <20230525081016.1870364-1-thuth@redhat.com>
Though we are already using CONFIG_RTL8139_PCI in the meson.build file
for testing whether the rtl8139 device is available or not, this is not
enough: The CONFIG switch might have been selected by another target
(e.g. the mips fuloong2e machine has the rtl8139 chip soldered on the
board), so CONFIG_RTL8139_PCI ends up in config_all_devices and the
test then gets executed on x86. We need an additional run-time check
to be on the safe side to make this test also work when configure has
been run with "--without-default-devices".
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/rtl8139-test.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
index 4bd240e9ee..4dc0a0d22e 100644
--- a/tests/qtest/rtl8139-test.c
+++ b/tests/qtest/rtl8139-test.c
@@ -209,6 +209,10 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
+ if (!qtest_has_device("rtl8139")) {
+ return 0;
+ }
+
qtest_start("-device rtl8139");
qtest_add_func("/rtl8139/nop", nop);
--
2.31.1
next prev parent reply other threads:[~2023-05-25 8:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-25 8:10 [PATCH 0/4] tests/qtest: Check for devices before using them Thomas Huth
2023-05-25 8:10 ` [PATCH 1/4] tests/qtest/usb-hcd-uhci-test: Check whether "usb-storage" is available Thomas Huth
2023-05-25 9:28 ` Ani Sinha
2023-05-25 8:10 ` [PATCH 2/4] tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine Thomas Huth
2023-05-25 11:13 ` Fabiano Rosas
2023-05-25 8:10 ` Thomas Huth [this message]
2023-05-25 11:14 ` [PATCH 3/4] tests/qtest/rtl8139-test: Check whether the rtl8139 device is available Fabiano Rosas
2023-05-25 8:10 ` [PATCH 4/4] tests/qtest/usb-hcd-ehci-test: Check for EHCI and UHCI HCDs before using them Thomas Huth
2023-05-25 9:28 ` Ani Sinha
2023-06-22 20:06 ` [PATCH 0/4] tests/qtest: Check for devices " Michael S. Tsirkin
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=20230525081016.1870364-4-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=anisinha@redhat.com \
--cc=farosas@suse.de \
--cc=imammedo@redhat.com \
--cc=jsnow@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.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).