OSDN Git Service

tests/qtest/usb-hcd-uhci-test: Check whether "usb-storage" is available
authorThomas Huth <thuth@redhat.com>
Thu, 25 May 2023 08:10:13 +0000 (10:10 +0200)
committerThomas Huth <thuth@redhat.com>
Fri, 26 May 2023 07:10:49 +0000 (09:10 +0200)
The "usb-storage" device might not have been compiled into the binary
(e.g. when compiling with "--without-default-devices"), so we have to
check first before using it.

Message-Id: <20230525081016.1870364-2-thuth@redhat.com>
Reviewed-by: Ani Sinha <anisinha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
tests/qtest/usb-hcd-uhci-test.c

index 84ac2f3..28751f5 100644 (file)
@@ -74,7 +74,9 @@ int main(int argc, char **argv)
     qtest_add_func("/uhci/pci/init", test_uhci_init);
     qtest_add_func("/uhci/pci/port1", test_port_1);
     qtest_add_func("/uhci/pci/hotplug", test_uhci_hotplug);
-    qtest_add_func("/uhci/pci/hotplug/usb-storage", test_usb_storage_hotplug);
+    if (qtest_has_device("usb-storage")) {
+        qtest_add_func("/uhci/pci/hotplug/usb-storage", test_usb_storage_hotplug);
+    }
 
     if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
         qs = qtest_pc_boot("%s", cmd);