reorganize usb tests variants

Create a new "usb" test and move over all usb subtests step by step.
Reduce duplication and allow to run usb tests with a simple --tests=usb
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>

kvm/tests/cfg/reboot_with_usb.cfg

-- reboot_with_usb:
-    only Linux
-    type = boot
-    reboot_method = shell
-    kill_vm_on_error = yes
-    login_timeout = 240
-    variants:
-        - ehci:
-            # Disable other usb devices
-            usb_devices = ""
-            usbs = usb1
-            usb_type_usb1 = usb-ehci
-            usb_max_port_usb1 = 6
-            check_func = "check_usb_device"
-            info_usb_name = ""
-            vendor_id = "1d6b"
-            vendor = "Linux Foundation"
-            product_id = "0002"
-            product = "EHCI Host Controller"
-        - keyboard:
-            usb_devices = kbd1
-            usb_type_kbd1 = usb-kbd
-            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
-            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
-        - usb_audio:
-            usb_devices = audio1
-            usb_type_audio1 = usb-audio
-            usb_controller_audio1 = uhci
-            check_func = "check_usb_device"
-            info_usb_name = "QEMU USB Audio"
-            vendor_id = "46f4"
-            vendor = ""
-            product_id = "0002"
-            product = "QEMU USB Audio"
-        - hub:
-            usb_devices = hub1
-            usb_type_hub1 = usb-hub
-            usb_controller_hub1 = uhci
-            check_func = "check_usb_device"
-            info_usb_name = "QEMU USB Hub"
-            vendor_id = "(0000|0409)"
-            vendor = ""
-            product_id = "(0000|55aa)"
-            product = "QEMU USB Hub"
-        - storage:
-            # Disable other usb devices
-            usb_devices = ""
-            usbs = usb1
-            check_func = "check_usb_device"
-            info_usb_name = "QEMU USB MSD"
-            vendor_id = "(0000|46f4)"
-            vendor = ""
-            product_id = "(0000|0001)"
-            product = "QEMU USB HARDDRIVE"
-            images += " stg"
-            image_boot_image1 = yes
-            image_name_stg = "usbdevice"
-            image_format_stg = "qcow2"
-            image_boot_stg = no
-            drive_index_stg = 1
-            create_image_stg = yes
-            image_size_stg = 10M
-            variants:
-                - uhci:
-                    usb_type_usb1 = piix3-usb-uhci
-                    usb_max_port_usb1 = 2
-                    drive_format_stg = "usb1"
-                - ehci:
-                    usb_type_usb1 = ich9-usb-ehci1
-                    usb_max_port_usb1 = 6
-                    drive_format_stg = "usb2"
-                - xhci:
-                    usb_type_usb1 = nec-usb-xhci
-                    usb_max_port_usb1 = 4
-                    drive_format_stg = "usb3"

kvm/tests/cfg/boot_with_usb.cfg → kvm/tests/cfg/usb.cfg

-- boot_with_usb:
+- usb:
+    virt_test_type = kvm
     only Linux
-    type = boot
     restart_vm = yes
     kill_vm_on_error = yes
-    login_timeout = 240
+    usbs += " usbtest"
+
+    # usb controllers
     variants:
+        - uhci:
+            usb_type_usbtest = piix3-usb-uhci
+            usb_controller_testdev = uhci
+            usb_max_port_usbtest = 2
+            drive_format_stg = "usb1"
         - ehci:
-            # Disable other usb devices
-            usb_devices = ""
-            usbs = usb1
-            usb_type_usb1 = usb-ehci
-            usb_max_port_usb1 = 6
-            check_func = "check_usb_device"
-            info_usb_name = ""
-            vendor_id = "1d6b"
-            vendor = "Linux Foundation"
-            product_id = "0002"
-            product = "EHCI Host Controller"
-        - keyboard:
-            usb_devices = kbd1
-            usb_type_kbd1 = usb-kbd
-            check_func = "check_usb_device"
+            usb_type_usbtest = ich9-usb-ehci1
+            usb_controller_testdev = ehci
+            usb_max_port_usbtest = 6
+            drive_format_stg = "usb2"
+        - xhci:
+            usb_type_usbtest = nec-usb-xhci
+            usb_controller_testdev = xhci
+            usb_max_port_usbtest = 4
+            drive_format_stg = "usb3"
+
+    # usb devices (boot+reboot tests)
+    variants:
+        - @usb_nodev:
+            only usb_storage, usb_host
+        - usb_kbd:
+            only usb_boot, usb_reboot, usb_hotplug
+            usb_type_testdev = "usb-kbd"
             info_usb_name = "QEMU USB Keyboard"
             vendor_id = "0627"
-            vendor = "Adomax Technology Co., Ltd"
             product_id = "0001"
+            vendor = "Adomax Technology Co., Ltd"
             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
-            check_func = "check_usb_device"
+        - usb_mouse:
+            only usb_boot, usb_reboot, usb_hotplug
+            usb_type_testdev = "usb-mouse"
             info_usb_name = "QEMU USB Mouse"
             vendor_id = "0627"
-            vendor = "Adomax Technology Co., Ltd"
             product_id = "0001"
+            vendor = "Adomax Technology Co., Ltd"
             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
+        - usb_tablet:
+            only usb_boot, usb_reboot, usb_hotplug
+            usb_type_testdev = "usb-tablet"
+            info_usb_name = "QEMU USB Tablet"
+            vendor_id = "0627"
+            product_id = "0001"
+            vendor = "Adomax Technology Co., Ltd"
+            product = "QEMU USB Tablet"
+        - usb_ccid:
+            only usb_boot, usb_reboot, usb_hotplug
+            usb_type_testdev = "usb-ccid"
+            info_usb_name = "QEMU USB CCID"
+            vendor_id = "08e6"
+            product_id = "4433"
+            vendor = "Gemplus"
+            product = "QEMU USB CCID"
         - usb_audio:
-            usb_devices = audio1
-            usb_type_audio1 = usb-audio
-            usb_controller_audio1 = uhci
-            check_func = "check_usb_device"
+            only usb_boot, usb_reboot, usb_hotplug
+            usb_type_testdev = usb-audio
             info_usb_name = "QEMU USB Audio"
             vendor_id = "46f4"
-            vendor = ""
             product_id = "0002"
+            vendor = ""
             product = "QEMU USB Audio"
-        - hub:
-            usb_devices = hub1
-            usb_type_hub1 = usb-hub
-            usb_controller_hub1 = uhci
-            check_func = "check_usb_device"
+        - usb_hub:
+            only usb_boot, usb_reboot, usb_hotplug
+            usb_type_testdev = usb-hub
             info_usb_name = "QEMU USB Hub"
             vendor_id = "(0000|0409)"
-            vendor = ""
             product_id = "(0000|55aa)"
+            vendor = ""
             product = "QEMU USB Hub"
-        - storage:
-            # Disable other usb devices
-            usb_devices = ""
-            usbs = usb1
+
+    # usb tests
+    variants:
+        - usb_boot:
+            type = boot
+            usb_devices += " testdev"
             check_func = "check_usb_device"
-            info_usb_name = "QEMU USB MSD"
-            vendor_id = "(0000|46f4)"
-            vendor = ""
-            product_id = "(0000|0001)"
-            product = "QEMU USB HARDDRIVE"
+        - usb_reboot:
+            type = boot
+            reboot_method = shell
+            usb_devices += " testdev"
+            check_func = "check_usb_device"
+        - usb_hotplug:
+            type = usb_hotplug
+        - usb_storage:
+            type = usb
             images += " stg"
             image_boot_image1 = yes
             image_name_stg = "usbdevice"
@@ -89,16 +99,12 @@
             drive_index_stg = 1
             create_image_stg = yes
             image_size_stg = 10M
-            variants:
-                - uhci:
-                    usb_type_usb1 = piix3-usb-uhci
-                    usb_max_port_usb1 = 2
-                    drive_format_stg = "usb1"
-                - ehci:
-                    usb_type_usb1 = ich9-usb-ehci1
-                    usb_max_port_usb1 = 6
-                    drive_format_stg = "usb2"
-                - xhci:
-                    usb_type_usb1 = nec-usb-xhci
-                    usb_max_port_usb1 = 4
-                    drive_format_stg = "usb3"
+            fdisk_string = "10 MB, 10485760 bytes"
+            format_timeout = 400
+            check_serial_option = yes
+            check_removable_option = yes
+            check_io_size_option = yes
+        - usb_host:
+            # must configure which device should be used
+            #usb_host_device = "<vendorid>:<productid>"
+            type = usb_host

kvm/tests/cfg/usb_storage.cfg

@@ -33,3 +33,4 @@
             usb_type_usb1 = nec-usb-xhci
             usb_max_port_usb1 = 4
             drive_format_stg = "usb3"
+