[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/22] tests/qtest: Skip unplug tests that use missing devices
From: |
Thomas Huth |
Subject: |
[PULL 14/22] tests/qtest: Skip unplug tests that use missing devices |
Date: |
Tue, 14 Feb 2023 12:21:40 +0100 |
From: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Message-Id: <20230208194700.11035-8-farosas@suse.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/device-plug-test.c | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c
index 4f92617335..01cecd6e20 100644
--- a/tests/qtest/device-plug-test.c
+++ b/tests/qtest/device-plug-test.c
@@ -68,6 +68,11 @@ static void test_pci_unplug_request(void)
const char *arch = qtest_get_arch();
const char *machine_addition = "";
+ if (!qtest_has_device("virtio-mouse-pci")) {
+ g_test_skip("Device virtio-mouse-pci not available");
+ return;
+ }
+
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
machine_addition = "-machine pc";
}
@@ -82,11 +87,17 @@ static void test_pci_unplug_request(void)
static void test_q35_pci_unplug_request(void)
{
+ QTestState *qtest;
+
+ if (!qtest_has_device("virtio-mouse-pci")) {
+ g_test_skip("Device virtio-mouse-pci not available");
+ return;
+ }
- QTestState *qtest = qtest_initf("-machine q35 "
- "-device pcie-root-port,id=p1 "
- "-device pcie-pci-bridge,bus=p1,id=b1 "
- "-device virtio-mouse-pci,bus=b1,id=dev0");
+ qtest = qtest_initf("-machine q35 "
+ "-device pcie-root-port,id=p1 "
+ "-device pcie-pci-bridge,bus=p1,id=b1 "
+ "-device virtio-mouse-pci,bus=b1,id=dev0");
process_device_remove(qtest, "dev0");
@@ -99,6 +110,11 @@ static void test_pci_unplug_json_request(void)
const char *arch = qtest_get_arch();
const char *machine_addition = "";
+ if (!qtest_has_device("virtio-mouse-pci")) {
+ g_test_skip("Device virtio-mouse-pci not available");
+ return;
+ }
+
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
machine_addition = "-machine pc";
}
@@ -114,6 +130,7 @@ static void test_pci_unplug_json_request(void)
static void test_q35_pci_unplug_json_request(void)
{
+ QTestState *qtest;
const char *port = "-device \"{'driver': 'pcie-root-port', "
"'id': 'p1'}\"";
@@ -125,8 +142,12 @@ static void test_q35_pci_unplug_json_request(void)
"'bus': 'b1', "
"'id': 'dev0'}\"";
- QTestState *qtest = qtest_initf("-machine q35 %s %s %s",
- port, bridge, device);
+ if (!qtest_has_device("virtio-mouse-pci")) {
+ g_test_skip("Device virtio-mouse-pci not available");
+ return;
+ }
+
+ qtest = qtest_initf("-machine q35 %s %s %s", port, bridge, device);
process_device_remove(qtest, "dev0");
--
2.31.1
- [PULL 02/22] meson: Add missing libdw knobs, (continued)
- [PULL 02/22] meson: Add missing libdw knobs, Thomas Huth, 2023/02/14
- [PULL 04/22] build: deprecate --enable-gprof builds and remove from CI, Thomas Huth, 2023/02/14
- [PULL 05/22] tests/qtest/npcm7xx_pwm-test: Be less verbose unless V=2, Thomas Huth, 2023/02/14
- [PULL 06/22] hw/misc/sga: Remove the deprecated "sga" device, Thomas Huth, 2023/02/14
- [PULL 09/22] tests/qtest: Skip PXE tests for missing devices, Thomas Huth, 2023/02/14
- [PULL 07/22] include/hw: Do not include "hw/registerfields.h" in headers that don't need it, Thomas Huth, 2023/02/14
- [PULL 08/22] Do not include "qemu/error-report.h" in headers that do not need it, Thomas Huth, 2023/02/14
- [PULL 10/22] tests/qtest: Do not run lsi53c895a test if device is not present, Thomas Huth, 2023/02/14
- [PULL 12/22] tests/qtest: hd-geo-test: Check for missing devices, Thomas Huth, 2023/02/14
- [PULL 11/22] tests/qtest: Add dependence on PCIE_PORT for virtio-net-failover.c, Thomas Huth, 2023/02/14
- [PULL 14/22] tests/qtest: Skip unplug tests that use missing devices,
Thomas Huth <=
- [PULL 15/22] tests/qtest: drive_del-test: Skip tests that require missing devices, Thomas Huth, 2023/02/14
- [PULL 16/22] tests/qtest: Check for devices in bios-tables-test, Thomas Huth, 2023/02/14
- [PULL 18/22] tests/qemu-iotests: Require virtio-scsi-pci, Thomas Huth, 2023/02/14
- [PULL 17/22] tests/qtest: Do not include hexloader-test if loader device is not present, Thomas Huth, 2023/02/14
- [PULL 19/22] tests/qtest: bios-tables-test: Skip if missing configs, Thomas Huth, 2023/02/14
- [PULL 21/22] tests/tcg/s390x: Use -nostdlib for softmmu tests, Thomas Huth, 2023/02/14
- [PULL 20/22] tests/qtest: Don't build virtio-serial-test.c if device not present, Thomas Huth, 2023/02/14
- [PULL 22/22] hw/s390x/event-facility: Replace DO_UPCAST(SCLPEvent) by SCLP_EVENT(), Thomas Huth, 2023/02/14
- [PULL 13/22] test/qtest: Fix coding style in device-plug-test.c, Thomas Huth, 2023/02/14
- Re: [PULL 00/22] qtest, s390x and misc patches, Peter Maydell, 2023/02/15