[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/8] tests/qtest/hd-geo-test: Check for the lsi53c895a controller
From: |
Thomas Huth |
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 |
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
- [PULL 0/8] Misc patches (tests, docs, compat machines), Thomas Huth, 2022/01/05
- [PULL 1/8] hw: Add compat machines for 7.0, Thomas Huth, 2022/01/05
- [PULL 2/8] tests/qtest/test-x86-cpuid-compat: Check for machines before using them, Thomas Huth, 2022/01/05
- [PULL 3/8] tests/qtest/hd-geo-test: Check for the lsi53c895a controller before using it,
Thomas Huth <=
- [PULL 4/8] tests/unit/test-util-sockets: Use g_file_open_tmp() to create temp file, Thomas Huth, 2022/01/05
- [PULL 5/8] qemu-options: Remove the deprecated -no-quit option, Thomas Huth, 2022/01/05
- [PULL 7/8] gitlab-ci: Enable docs in the centos job, Thomas Huth, 2022/01/05
- [PULL 6/8] docs/sphinx: fix compatibility with sphinx < 1.8, Thomas Huth, 2022/01/05
- [PULL 8/8] docs/tools/qemu-trace-stap.rst: Do not hard-code the QEMU binary name, Thomas Huth, 2022/01/05
- Re: [PULL 0/8] Misc patches (tests, docs, compat machines), Richard Henderson, 2022/01/05