Changeset 68158 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 28, 2017 2:36:33 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

117247

Message:

Main/ApplianceImport: bugref:8930: don't enable OHCI if xHCI is enabled

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -3466 +3466 @@
         /** @todo r=klaus add support for arbitrary USB controller types, this can't handle
          *  multiple controllers due to its design anyway */
-        /* usually the OHCI controller is enabled already, need to check */
+        /* Usually the OHCI controller is enabled already, need to check. But
+         * do this only if there is no xHCI controller. */
         bool fOHCIEnabled = false;
+        bool fXHCIEnabled = false;
         settings::USBControllerList &llUSBControllers = config.hardwareMachine.usbSettings.llUSBControllers;
         settings::USBControllerList::iterator it;
@@ -3473 +3475 @@
         {
             if (it->enmType == USBControllerType_OHCI)
-            {
                 fOHCIEnabled = true;
-                break;
-            }
+            if (it->enmType == USBControllerType_XHCI)
+                fXHCIEnabled = true;
         }
 
-        if (!fOHCIEnabled)
+        if (!fXHCIEnabled && !fOHCIEnabled)
         {
             settings::USBController ctrl;