diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-05-25 10:10:14 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-05-26 09:10:49 +0200 |
| commit | 8c730de717f431868919f2a8323442b8bd77545e (patch) | |
| tree | 0ed78674f39b0fc18a091d687268f29a3e5b58c5 /tests | |
| parent | 54c8ff27f60dfef7909b4a4a5a9ed96fc2ce8197 (diff) | |
| download | qemu-8c730de717f431868919f2a8323442b8bd77545e.zip qemu-8c730de717f431868919f2a8323442b8bd77545e.tar.gz qemu-8c730de717f431868919f2a8323442b8bd77545e.tar.bz2 | |
tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qtest/bios-tables-test.c | 2 | ||||
| -rw-r--r-- | 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 159e4ed..ed1c69c 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 d1cc375..f2a8d91 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); |