qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: Fabiano Rosas <farosas@suse.de>
Subject: [PULL 10/15] tests/qtest/rtl8139-test: Check whether the rtl8139 device is available
Date: Fri, 26 May 2023 11:08:35 +0200	[thread overview]
Message-ID: <20230526090840.2225958-11-thuth@redhat.com> (raw)
In-Reply-To: <20230526090840.2225958-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".

Message-Id: <20230525081016.1870364-4-thuth@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
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



  parent reply	other threads:[~2023-05-26  9:10 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-26  9:08 [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330 Thomas Huth
2023-05-26  9:08 ` [PULL 01/15] hw/hppa: Use MachineClass->default_nic in the hppa machine Thomas Huth
2023-05-26  9:08 ` [PULL 02/15] hw/alpha: Use MachineClass->default_nic in the alpha machine Thomas Huth
2023-05-26  9:08 ` [PULL 03/15] hw/arm: Use MachineClass->default_nic in the virt machine Thomas Huth
2023-05-26  9:08 ` [PULL 04/15] hw/loongarch64: " Thomas Huth
2023-05-26  9:08 ` [PULL 05/15] hw/xtensa: " Thomas Huth
2023-05-26  9:08 ` [PULL 06/15] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine Thomas Huth
2023-05-26  9:08 ` [PULL 07/15] hw/mips: Use MachineClass->default_nic in the virt machine Thomas Huth
2023-05-26  9:08 ` [PULL 08/15] tests/qtest/usb-hcd-uhci-test: Check whether "usb-storage" is available Thomas Huth
2023-05-26  9:08 ` [PULL 09/15] tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine Thomas Huth
2023-05-26  9:08 ` Thomas Huth [this message]
2023-05-26  9:08 ` [PULL 11/15] tests/qtest/usb-hcd-ehci-test: Check for EHCI and UHCI HCDs before using them Thomas Huth
2023-05-26  9:08 ` [PULL 12/15] tests/qtest/ac97-test: add up-/downsampling tests Thomas Huth
2023-05-26  9:08 ` [PULL 13/15] machine: do not crash if default RAM backend name has been stolen Thomas Huth
2023-05-26  9:08 ` [PULL 14/15] lsi53c895a: disable reentrancy detection for MMIO region, too Thomas Huth
2023-05-26  9:08 ` [PULL 15/15] hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI controller (CVE-2023-0330) Thomas Huth
2023-05-26 16:17 ` [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330 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=20230526090840.2225958-11-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=farosas@suse.de \
    --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).