Signed-off-by: Gerd Hoffmann <[email protected]>
---
 client/virt/subtests.cfg.sample |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/client/virt/subtests.cfg.sample b/client/virt/subtests.cfg.sample
index fd73014..4777434 100644
--- a/client/virt/subtests.cfg.sample
+++ b/client/virt/subtests.cfg.sample
@@ -399,23 +399,37 @@ variants:
             - keyboard:
                 usb_devices = kbd1
                 usb_type_kbd1 = usb-kbd
-                usb_controller_kbd1 = uhci
                 check_func = "check_usb_device"
                 info_usb_name = "QEMU USB Keyboard"
                 vendor_id = "0627"
                 vendor = "Adomax Technology Co., Ltd"
                 product_id = "0001"
                 product = "QEMU USB Keyboard"
+                variants:
+                    - uhci:
+                        usb_controller_kbd1 = uhci
+                    - xhci:
+                        usbs += " xhci"
+                        usb_type_xhci = nec-usb-xhci
+                        usb_max_port_xhci = 4
+                        usb_controller_kbd1 = xhci
             - mouse:
                 usb_devices = mouse1
                 usb_type_mouse1 = usb-mouse
-                usb_controller_mouse1 = uhci
                 check_func = "check_usb_device"
                 info_usb_name = "QEMU USB Mouse"
                 vendor_id = "0627"
                 vendor = "Adomax Technology Co., Ltd"
                 product_id = "0001"
                 product = "QEMU USB Mouse"
+                variants:
+                    - uhci:
+                        usb_controller_mouse1 = uhci
+                    - xhci:
+                        usbs += " xhci"
+                        usb_type_xhci = nec-usb-xhci
+                        usb_max_port_xhci = 4
+                        usb_controller_mouse1 = xhci
             - hub:
                 usb_devices = hub1
                 usb_type_hub1 = usb-hub
@@ -489,23 +503,37 @@ variants:
             - keyboard:
                 usb_devices = kbd1
                 usb_type_kbd1 = usb-kbd
-                usb_controller_kbd1 = uhci
                 check_func = "check_usb_device"
                 info_usb_name = "QEMU USB Keyboard"
                 vendor_id = "0627"
                 vendor = "Adomax Technology Co., Ltd"
                 product_id = "0001"
                 product = "QEMU USB Keyboard"
+                variants:
+                    - uhci:
+                        usb_controller_kbd1 = uhci
+                    - xhci:
+                        usbs += " xhci"
+                        usb_type_xhci = nec-usb-xhci
+                        usb_max_port_xhci = 4
+                        usb_controller_kbd1 = xhci
             - mouse:
                 usb_devices = mouse1
                 usb_type_mouse1 = usb-mouse
-                usb_controller_mouse1 = uhci
                 check_func = "check_usb_device"
                 info_usb_name = "QEMU USB Mouse"
                 vendor_id = "0627"
                 vendor = "Adomax Technology Co., Ltd"
                 product_id = "0001"
                 product = "QEMU USB Mouse"
+                variants:
+                    - uhci:
+                        usb_controller_mouse1 = uhci
+                    - xhci:
+                        usbs += " xhci"
+                        usb_type_xhci = nec-usb-xhci
+                        usb_max_port_xhci = 4
+                        usb_controller_mouse1 = xhci
             - hub:
                 usb_devices = hub1
                 usb_type_hub1 = usb-hub
-- 
1.7.1

_______________________________________________
Autotest-kernel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/autotest-kernel

Reply via email to