Changeset 56383 in vbox

Timestamp:

Jun 12, 2015 11:57:25 AM (10 years ago)

Author:

vboxsync

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

100982

Message:

VBoxManage: Do not enable OHCI when xHCI is already there and USB mouse/keboard is configured.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1935 +1935 @@
                 if (fEnableUsb)
                 {
-                    /* Make sure the OHCI controller is enabled. */
+                    /* Make sure either the OHCI or xHCI controller is enabled. */
                     ULONG cOhciCtrls = 0;
+                    ULONG cXhciCtrls = 0;
                     rc = sessionMachine->GetUSBControllerCountByType(USBControllerType_OHCI, &cOhciCtrls);
-                    if (   SUCCEEDED(rc)
-                        && !cOhciCtrls)
-                    {
-                        ComPtr<IUSBController> UsbCtl;
-                        CHECK_ERROR(sessionMachine, AddUSBController(Bstr("OHCI").raw(), USBControllerType_OHCI,
-                                                              UsbCtl.asOutParam()));
+                    if (SUCCEEDED(rc)) {
+                        rc = sessionMachine->GetUSBControllerCountByType(USBControllerType_XHCI, &cXhciCtrls);
+                        if (   SUCCEEDED(rc)
+                            && cOhciCtrls + cXhciCtrls == 0)
+                        {
+                            /* If there's nothing, enable OHCI (always available). */
+                            ComPtr<IUSBController> UsbCtl;
+                            CHECK_ERROR(sessionMachine, AddUSBController(Bstr("OHCI").raw(), USBControllerType_OHCI,
+                                                                  UsbCtl.asOutParam()));
+                        }
                     }
                 }
@@ -1969 +1974 @@
                 if (fEnableUsb)
                 {
-                    /* Make sure the OHCI controller is enabled. */
+                    /* Make sure either the OHCI or xHCI controller is enabled. */
                     ULONG cOhciCtrls = 0;
+                    ULONG cXhciCtrls = 0;
                     rc = sessionMachine->GetUSBControllerCountByType(USBControllerType_OHCI, &cOhciCtrls);
-                    if (   SUCCEEDED(rc)
-                        && !cOhciCtrls)
-                    {
-                        ComPtr<IUSBController> UsbCtl;
-                        CHECK_ERROR(sessionMachine, AddUSBController(Bstr("OHCI").raw(), USBControllerType_OHCI,
-                                                              UsbCtl.asOutParam()));
+                    if (SUCCEEDED(rc)) {
+                        rc = sessionMachine->GetUSBControllerCountByType(USBControllerType_XHCI, &cXhciCtrls);
+                        if (   SUCCEEDED(rc)
+                            && cOhciCtrls + cXhciCtrls == 0)
+                        {
+                            /* If there's nothing, enable OHCI (always available). */
+                            ComPtr<IUSBController> UsbCtl;
+                            CHECK_ERROR(sessionMachine, AddUSBController(Bstr("OHCI").raw(), USBControllerType_OHCI,
+                                                                  UsbCtl.asOutParam()));
+                        }
                     }
                 }