qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL 3/8] tests/qtest/hd-geo-test: Check for the lsi53c895a controller before using it
Date: Wed,  5 Jan 2022 13:36:07 +0100	[thread overview]
Message-ID: <20220105123612.432038-4-thuth@redhat.com> (raw)
In-Reply-To: <20220105123612.432038-1-thuth@redhat.com>

The lsi53c895a SCSI controller might have been disabled in the target
binary, so let's check for its availability first before using it.

Message-Id: <20211222153600.976588-1-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/hd-geo-test.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index 113126ae06..771eaa741b 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -960,9 +960,11 @@ int main(int argc, char **argv)
     qtest_add_func("hd-geo/ide/device/user/chst", test_ide_device_user_chst);
     if (have_qemu_img()) {
         qtest_add_func("hd-geo/override/ide", test_override_ide);
-        qtest_add_func("hd-geo/override/scsi", test_override_scsi);
-        qtest_add_func("hd-geo/override/scsi_2_controllers",
-                       test_override_scsi_2_controllers);
+        if (qtest_has_device("lsi53c895a")) {
+            qtest_add_func("hd-geo/override/scsi", test_override_scsi);
+            qtest_add_func("hd-geo/override/scsi_2_controllers",
+                           test_override_scsi_2_controllers);
+        }
         qtest_add_func("hd-geo/override/virtio_blk", test_override_virtio_blk);
         qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs);
         qtest_add_func("hd-geo/override/scsi_hot_unplug",
-- 
2.27.0



  parent reply	other threads:[~2022-01-05 12:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-05 12:36 [PULL 0/8] Misc patches (tests, docs, compat machines) Thomas Huth
2022-01-05 12:36 ` [PULL 1/8] hw: Add compat machines for 7.0 Thomas Huth
2022-01-05 12:36 ` [PULL 2/8] tests/qtest/test-x86-cpuid-compat: Check for machines before using them Thomas Huth
2022-01-05 12:36 ` Thomas Huth [this message]
2022-01-05 12:36 ` [PULL 4/8] tests/unit/test-util-sockets: Use g_file_open_tmp() to create temp file Thomas Huth
2022-01-05 12:36 ` [PULL 5/8] qemu-options: Remove the deprecated -no-quit option Thomas Huth
2022-01-05 12:36 ` [PULL 6/8] docs/sphinx: fix compatibility with sphinx < 1.8 Thomas Huth
2022-01-05 12:36 ` [PULL 7/8] gitlab-ci: Enable docs in the centos job Thomas Huth
2022-01-05 12:36 ` [PULL 8/8] docs/tools/qemu-trace-stap.rst: Do not hard-code the QEMU binary name Thomas Huth
2022-01-05 18:05 ` [PULL 0/8] Misc patches (tests, docs, compat machines) 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=20220105123612.432038-4-thuth@redhat.com \
    --to=thuth@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).