[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/15] tests/qtest: Check for virtio-blk before using -cdrom with
From: |
Thomas Huth |
Subject: |
[PULL 09/15] tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine |
Date: |
Fri, 26 May 2023 11:08:34 +0200 |
The arm "virt" machine needs "virtio-blk-pci" for devices that get attached
via the "-cdrom" option. Since this is an optional device that might not
be available in the binary, we should check for the availability of this
device first before using it.
Message-Id: <20230525081016.1870364-3-thuth@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/bios-tables-test.c | 2 +-
tests/qtest/cdrom-test.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 159e4edb8f..ed1c69cf01 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -2164,7 +2164,7 @@ int main(int argc, char *argv[])
}
}
} else if (strcmp(arch, "aarch64") == 0) {
- if (has_tcg) {
+ if (has_tcg && qtest_has_device("virtio-blk-pci")) {
qtest_add_func("acpi/virt", test_acpi_virt_tcg);
qtest_add_func("acpi/virt/acpihmatvirt",
test_acpi_virt_tcg_acpi_hmat);
diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
index d1cc375849..f2a8d91929 100644
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@@ -264,9 +264,13 @@ int main(int argc, char **argv)
const char *armmachines[] = {
"realview-eb", "realview-eb-mpcore", "realview-pb-a8",
"realview-pbx-a9", "versatileab", "versatilepb", "vexpress-a15",
- "vexpress-a9", "virt", NULL
+ "vexpress-a9", NULL
};
add_cdrom_param_tests(armmachines);
+ if (qtest_has_device("virtio-blk-pci")) {
+ const char *virtmachine[] = { "virt", NULL };
+ add_cdrom_param_tests(virtmachine);
+ }
} else {
const char *nonemachine[] = { "none", NULL };
add_cdrom_param_tests(nonemachine);
--
2.31.1
- [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330, Thomas Huth, 2023/05/26
- [PULL 02/15] hw/alpha: Use MachineClass->default_nic in the alpha machine, Thomas Huth, 2023/05/26
- [PULL 01/15] hw/hppa: Use MachineClass->default_nic in the hppa machine, Thomas Huth, 2023/05/26
- [PULL 04/15] hw/loongarch64: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 03/15] hw/arm: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 06/15] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine, Thomas Huth, 2023/05/26
- [PULL 05/15] hw/xtensa: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 08/15] tests/qtest/usb-hcd-uhci-test: Check whether "usb-storage" is available, Thomas Huth, 2023/05/26
- [PULL 10/15] tests/qtest/rtl8139-test: Check whether the rtl8139 device is available, Thomas Huth, 2023/05/26
- [PULL 07/15] hw/mips: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/26
- [PULL 09/15] tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine,
Thomas Huth <=
- [PULL 11/15] tests/qtest/usb-hcd-ehci-test: Check for EHCI and UHCI HCDs before using them, Thomas Huth, 2023/05/26
- [PULL 13/15] machine: do not crash if default RAM backend name has been stolen, Thomas Huth, 2023/05/26
- [PULL 14/15] lsi53c895a: disable reentrancy detection for MMIO region, too, Thomas Huth, 2023/05/26
- [PULL 15/15] hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI controller (CVE-2023-0330), Thomas Huth, 2023/05/26
- [PULL 12/15] tests/qtest/ac97-test: add up-/downsampling tests, Thomas Huth, 2023/05/26
- Re: [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330, Richard Henderson, 2023/05/26