Changeset 47970 in vbox

Timestamp:

Aug 21, 2013 1:57:27 PM (11 years ago)

Author:

vboxsync

Message:

Main/Appliance: fix USB controller handling in the import code path (when the appliance was created by VirtualBox)

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)

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

@@ -3284 +3284 @@
     if (stack.fUSBEnabled)
     {
-        settings::USBController ctrl;
-
-        ctrl.strName = "OHCI";
-        ctrl.enmType = USBControllerType_OHCI;
-
-        config.hardwareMachine.usbSettings.llUSBControllers.push_back(ctrl);
-    }
+        /** @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 */
+        bool fOHCIEnabled = false;
+        settings::USBControllerList &llUSBControllers = config.hardwareMachine.usbSettings.llUSBControllers;
+        settings::USBControllerList::iterator it;
+        for (it = llUSBControllers.begin(); it != llUSBControllers.end(); ++it)
+        {
+            if (it->enmType == USBControllerType_OHCI)
+            {
+                fOHCIEnabled = true;
+                break;
+            }
+        }
+
+        if (!fOHCIEnabled)
+        {
+            settings::USBController ctrl;
+            ctrl.strName = "OHCI";
+            ctrl.enmType = USBControllerType_OHCI;
+
+            llUSBControllers.push_back(ctrl);
+        }
+    }
+    else
+        config.hardwareMachine.usbSettings.llUSBControllers.clear();
 #endif
     /* Audio adapter */