From 210cb858bc55d59c4caf8d96a064a100e38a494f Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 4 Oct 2018 11:55:57 -0400
Subject: [PATCH] controller: usb: Use ports=15 for usb3

It's the max that qemu supports, so why not add as many as possible.
Gerd indicated in private mail that he didn't know of any issues
with it.
---
 tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml     | 4 ++--
 tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml  | 2 +-
 tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml   | 2 +-
 .../cli-test-xml/compare/virt-install-aarch64-kvm-import.xml  | 2 +-
 .../cli-test-xml/compare/virt-install-aarch64-machdefault.xml | 2 +-
 tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml  | 2 +-
 .../cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml | 2 +-
 tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml    | 2 +-
 tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml      | 2 +-
 tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml    | 2 +-
 tests/cli-test-xml/compare/virt-install-kvm-centos7.xml       | 4 ++--
 .../compare/virt-install-kvm-fedoralatest-url.xml             | 4 ++--
 tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml         | 4 ++--
 .../compare/virt-install-kvm-session-defaults.xml             | 4 ++--
 tests/cli-test-xml/compare/virt-install-kvm-win10.xml         | 4 ++--
 .../compare/virt-install-ppc64-machdefault-f20.xml            | 2 +-
 tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml | 2 +-
 .../cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml  | 2 +-
 tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml     | 2 +-
 .../cli-test-xml/compare/virt-install-singleton-config-2.xml  | 4 ++--
 tests/cli-test-xml/compare/virt-install-spice-gl.xml          | 2 +-
 virtinst/devices/controller.py                                | 4 +++-
 22 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml b/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
index 69bc1bfc..212c47fd 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
@@ -28,7 +28,7 @@
       <target dev="sdb" bus="scsi"/>
       <readonly/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <interface type="bridge">
       <source bridge="eth0"/>
@@ -69,7 +69,7 @@
       <target dev="sdb" bus="scsi"/>
       <readonly/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <interface type="bridge">
       <source bridge="eth0"/>
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml b/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
index 7bc1b0ec..d406a461 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
@@ -18,7 +18,7 @@
   <clock offset="utc"/>
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <console type="pty"/>
     <channel type="unix">
       <source mode="bind"/>
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
index b16cff4c..96175f87 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
@@ -29,7 +29,7 @@
     <controller type="scsi" index="0" model="virtio-scsi">
       <address type="pci"/>
     </controller>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="network">
       <source network="default"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
index e8a2ca1a..e63c4d6f 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
@@ -23,7 +23,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="sda" bus="scsi"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <interface type="bridge">
       <source bridge="eth0"/>
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml b/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
index d37da8e3..27494db4 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
@@ -21,7 +21,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="sda" bus="scsi"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <interface type="bridge">
       <source bridge="eth0"/>
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml b/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
index d37da8e3..27494db4 100644
--- a/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
+++ b/tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
@@ -21,7 +21,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="sda" bus="scsi"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <interface type="bridge">
       <source bridge="eth0"/>
diff --git a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml b/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
index d622b02d..5194c344 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
@@ -23,7 +23,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="sda" bus="scsi"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <interface type="bridge">
       <source bridge="eth0"/>
diff --git a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
index abfabd05..8d6e06f9 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
@@ -23,7 +23,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="sda" bus="scsi"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <interface type="bridge">
       <source bridge="eth0"/>
diff --git a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml b/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
index ddc24b5f..e94de3d1 100644
--- a/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
@@ -23,7 +23,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="sda" bus="scsi"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <interface type="bridge">
       <source bridge="eth0"/>
diff --git a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
index a1ef6df0..f070af83 100644
--- a/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
+++ b/tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
@@ -37,7 +37,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml b/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
index 90ae5ebb..48197fd3 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
@@ -39,7 +39,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
@@ -107,7 +107,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml b/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
index feb4f521..5d90e774 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
@@ -38,7 +38,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
@@ -93,7 +93,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml b/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
index e8a6ec36..3001d966 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
@@ -39,7 +39,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
@@ -107,7 +107,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
index 5c40bd85..e0779ad2 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
@@ -45,7 +45,7 @@
       <target dev="hda" bus="ide"/>
       <readonly/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="user">
       <mac address="00:11:22:33:44:55"/>
       <model type="virtio"/>
@@ -116,7 +116,7 @@
       <target dev="hda" bus="ide"/>
       <readonly/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="user">
       <mac address="00:11:22:33:44:55"/>
       <model type="virtio"/>
diff --git a/tests/cli-test-xml/compare/virt-install-kvm-win10.xml b/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
index 608beef9..f206283d 100644
--- a/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
+++ b/tests/cli-test-xml/compare/virt-install-kvm-win10.xml
@@ -51,7 +51,7 @@
       <target dev="hdb" bus="ide"/>
       <readonly/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
@@ -124,7 +124,7 @@
       <target dev="hdb" bus="ide"/>
       <readonly/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
index 2c143cbc..62d4c90a 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
@@ -21,7 +21,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <console type="pty"/>
     <channel type="unix">
       <source mode="bind"/>
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
index e7fdf2a3..c87ac525 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
@@ -25,7 +25,7 @@
       <target dev="sda" bus="scsi"/>
       <readonly/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="scsi" index="0" model="virtio-scsi"/>
     <console type="pty"/>
     <channel type="unix">
diff --git a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
index c4492fcf..4a47ec50 100644
--- a/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
+++ b/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
@@ -21,7 +21,7 @@
       <source file="/dev/default-pool/testvol1.img"/>
       <target dev="vda" bus="virtio"/>
     </disk>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml b/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
index a44dbc88..54ccc61a 100644
--- a/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
+++ b/tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
@@ -29,7 +29,7 @@
   </pm>
   <devices>
     <emulator>/usr/bin/qemu-kvm</emulator>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
index be217811..b94634f0 100644
--- a/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
+++ b/tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
@@ -129,7 +129,7 @@
   </pm>
   <devices>
     <emulator>/new/emu</emulator>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="virtio-scsi" index="0"/>
     <filesystem type="mount" accessmode="mapped">
       <source dir="/foo/source"/>
@@ -317,7 +317,7 @@
   </pm>
   <devices>
     <emulator>/new/emu</emulator>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <controller type="virtio-scsi" index="0"/>
     <filesystem type="mount" accessmode="mapped">
       <source dir="/foo/source"/>
diff --git a/tests/cli-test-xml/compare/virt-install-spice-gl.xml b/tests/cli-test-xml/compare/virt-install-spice-gl.xml
index 8c535e17..e98eddeb 100644
--- a/tests/cli-test-xml/compare/virt-install-spice-gl.xml
+++ b/tests/cli-test-xml/compare/virt-install-spice-gl.xml
@@ -32,7 +32,7 @@
   </pm>
   <devices>
     <emulator>/usr/bin/qemu-kvm</emulator>
-    <controller type="usb" index="0" model="qemu-xhci" ports="8"/>
+    <controller type="usb" index="0" model="qemu-xhci" ports="15"/>
     <interface type="bridge">
       <source bridge="eth0"/>
       <mac address="00:11:22:33:44:55"/>
diff --git a/virtinst/devices/controller.py b/virtinst/devices/controller.py
index 54255259..0da010e9 100644
--- a/virtinst/devices/controller.py
+++ b/virtinst/devices/controller.py
@@ -81,7 +81,9 @@ class DeviceController(Device):
         if conn.check_support(conn.SUPPORT_CONN_QEMU_XHCI):
             ctrl.model = "qemu-xhci"
         if conn.check_support(conn.SUPPORT_CONN_USB3_PORTS):
-            ctrl.ports = 8
+            # 15 is the max ports qemu supports, might as well
+            # Add as many as possible
+            ctrl.ports = 15
         return ctrl