tests/qtest/usb-hcd-xhci-test: Check availability of devices before using them

[PATCH] tests/qtest/usb-hcd-xhci-test: Check availability of devices before using them

Thomas Huth posted 1 patch 8 months, 4 weeks ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230822163024.61529-1-thuth@redhat.com

Maintainers: Gerd Hoffmann <kraxel@redhat.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>

tests/qtest/usb-hcd-xhci-test.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] tests/qtest/usb-hcd-xhci-test: Check availability of devices before using them

Posted by Thomas Huth 8 months, 4 weeks ago

The "usb-uas" and "usb-ccid" might not be compiled into the QEMU binary,
so let's better check first whether they are available.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/usb-hcd-xhci-test.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/usb-hcd-xhci-test.c b/tests/qtest/usb-hcd-xhci-test.c
index 10ef9d2a91..80bc039446 100644
--- a/tests/qtest/usb-hcd-xhci-test.c
+++ b/tests/qtest/usb-hcd-xhci-test.c
@@ -56,8 +56,12 @@ int main(int argc, char **argv)
 
     qtest_add_func("/xhci/pci/init", test_xhci_init);
     qtest_add_func("/xhci/pci/hotplug", test_xhci_hotplug);
-    qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug);
-    qtest_add_func("/xhci/pci/hotplug/usb-ccid", test_usb_ccid_hotplug);
+    if (qtest_has_device("usb-uas")) {
+        qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug);
+    }
+    if (qtest_has_device("usb-ccid")) {
+        qtest_add_func("/xhci/pci/hotplug/usb-ccid", test_usb_ccid_hotplug);
+    }
 
     qtest_start("-device nec-usb-xhci,id=xhci"
                 " -drive id=drive0,if=none,file=null-co://,"
-- 
2.39.3

Re: [PATCH] tests/qtest/usb-hcd-xhci-test: Check availability of devices before using them

Posted by Fabiano Rosas 8 months, 4 weeks ago

Thomas Huth <thuth@redhat.com> writes:

> The "usb-uas" and "usb-ccid" might not be compiled into the QEMU binary,
> so let's better check first whether they are available.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Fabiano Rosas <farosas@suse.de>