Changeset 50721 in vbox

Timestamp:

Mar 6, 2014 9:40:39 PM (11 years ago)

Author:

vboxsync

Message:

Updated USB configuration.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (3 diffs)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/src-client/BusAssignmentManager.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• Main/src-server/SystemPropertiesImpl.cpp (modified) (1 diff)
• Main/src-server/USBControllerImpl.cpp (modified) (2 diffs)
• Main/xml/Settings.cpp (modified) (2 diffs)

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

@@ -1777 +1777 @@
         bool fOhciEnabled = false;
         bool fEhciEnabled = false;
+        bool fXhciEnabled = false;
 
         for (unsigned i = 0; i < USBCtlColl.size(); i++)
@@ -1793 +1794 @@
                         fEhciEnabled = true;
                         break;
+                    case USBControllerType_XHCI:
+                        fXhciEnabled = true;
+                        break;
                     default:
                         break;
@@ -1808 +1812 @@
         else
             RTPrintf("EHCI:            %s\n", fEhciEnabled ? "enabled" : "disabled");
+
+        if (details == VMINFO_MACHINEREADABLE)
+            RTPrintf("xhci=\"%s\"\n", fXhciEnabled ? "on" : "off");
+        else
+            RTPrintf("XHCI:            %s\n", fXhciEnabled ? "enabled" : "disabled");
     }
 

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

@@ -161 +161 @@
     MODIFYVM_VRDE,
     MODIFYVM_RTCUSEUTC,
+    MODIFYVM_USBXHCI,
     MODIFYVM_USBEHCI,
     MODIFYVM_USB,
@@ -323 +324 @@
     { "--vrdeextpack",              MODIFYVM_VRDE_EXTPACK,              RTGETOPT_REQ_STRING },
     { "--vrde",                     MODIFYVM_VRDE,                      RTGETOPT_REQ_BOOL_ONOFF },
+    { "--usbxhci",                  MODIFYVM_USBXHCI,                   RTGETOPT_REQ_BOOL_ONOFF },
     { "--usbehci",                  MODIFYVM_USBEHCI,                   RTGETOPT_REQ_BOOL_ONOFF },
     { "--usb",                      MODIFYVM_USB,                       RTGETOPT_REQ_BOOL_ONOFF },
@@ -2363 +2365 @@
             }
 
+            case MODIFYVM_USBXHCI:
+            {
+                ULONG cXhciCtrls = 0;
+                rc = machine->GetUSBControllerCountByType(USBControllerType_XHCI, &cXhciCtrls);
+                if (SUCCEEDED(rc))
+                {
+                    if (!cXhciCtrls && ValueUnion.f)
+                    {
+                        ComPtr<IUSBController> UsbCtl;
+                        CHECK_ERROR(machine, AddUSBController(Bstr("XHCI").raw(), USBControllerType_XHCI,
+                                                              UsbCtl.asOutParam()));
+                    }
+                    else if (cXhciCtrls && !ValueUnion.f)
+                        CHECK_ERROR(machine, RemoveUSBController(Bstr("XHCI").raw()));
+                }
+                break;
+            }
+
             case MODIFYVM_USBEHCI:
             {

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -16899 +16899 @@
     <const name="OHCI"      value="1"/>
     <const name="EHCI"      value="2"/>
-    <const name="Last"      value="3">
+    <const name="XHCI"      value="3"/>
+    <const name="Last"      value="4">
       <desc>Last element (invalid). Used for parameter checks.</desc>
     </const>

trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp

@@ -72 +72 @@
     {"usb-ohci",      0,  6,  0, 0},
     {"usb-ehci",      0, 11,  0, 0},
+    {"usb-xhci",      0, 12,  0, 0},
 
     /* ACPI controller */

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1691 +1691 @@
         hrc = pMachine->COMGETTER(USBControllers)(ComSafeArrayAsOutParam(usbCtrls));        H();
         bool fOhciPresent = false; /**< Flag whether at least one OHCI controller is present. */
+        bool fXhciPresent = false; /**< Flag whether at least one XHCI controller is present. */
 
         for (size_t i = 0; i < usbCtrls.size(); ++i)
@@ -1701 +1702 @@
                 break;
             }
+            else if (enmCtrlType == USBControllerType_XHCI)
+            {
+                fXhciPresent = true;
+                break;
+            }
         }
 
         /*
-         * Currently EHCI is only enabled when a OHCI controller is present too.
-         * This might change when XHCI is supported.
+         * Currently EHCI is only enabled when an OHCI or XHCI controller is present as well.
          */
-        if (fOhciPresent)
+        if (fOhciPresent || fXhciPresent)
             mfVMHasUsbController = true;
 
@@ -1781 +1786 @@
                 }
 #endif
+                else if (enmCtrlType == USBControllerType_XHCI)
+                {
+                    /*
+                     * USB 3.0 is only available if the proper ExtPack is installed.
+                     *
+                     * Note. Configuring EHCI here and providing messages about
+                     * the missing extpack isn't exactly clean, but it is a
+                     * necessary evil to patch over legacy compatability issues
+                     * introduced by the new distribution model.
+                     */
+                    static const char *s_pszUsbExtPackName = "Oracle VM VirtualBox Extension Pack";
+# ifdef VBOX_WITH_EXTPACK
+                    if (mptrExtPackManager->isExtPackUsable(s_pszUsbExtPackName))
+# endif
+                    {
+                        InsertConfigNode(pDevices, "usb-xhci", &pDev);
+                        InsertConfigNode(pDev,     "0", &pInst);
+                        InsertConfigNode(pInst,    "Config", &pCfg);
+                        InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
+                        hrc = pBusMgr->assignPCIDevice("usb-xhci", pInst);                  H();
+
+                        InsertConfigNode(pInst,    "LUN#0", &pLunL0);
+                        InsertConfigString(pLunL0, "Driver",               "VUSBRootHub");
+                        InsertConfigNode(pLunL0,   "Config", &pCfg);
+
+                        /*
+                         * Attach the status driver.
+                         */
+                        attachStatusDriver(pInst, &mapUSBLed[1], 0, 0, NULL, NULL, 0);
+                    }
+# ifdef VBOX_WITH_EXTPACK
+                    else
+                    {
+                        /* Always fatal. */
+                        return VMR3SetError(pUVM, VERR_NOT_FOUND, RT_SRC_POS,
+                                N_("Implementation of the USB 3.0 controller not found!\n"
+                                   "Because the USB 3.0 controller state is part of the saved "
+                                   "VM state, the VM cannot be started. To fix "
+                                   "this problem, either install the '%s' or disable USB 3.0 "
+                                   "support in the VM settings"),
+                                s_pszUsbExtPackName);
+                    }
+# endif
+                }
             } /* for every USB controller. */
 

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

@@ -575 +575 @@
         case USBControllerType_OHCI:
         case USBControllerType_EHCI:
+        case USBControllerType_XHCI:
         {
             cCtrs = 1;

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

@@ -101 +101 @@
     ComAssertRet(aParent && !aName.isEmpty(), E_INVALIDARG);
     if (   (enmType <= USBControllerType_Null)
-        || (enmType >  USBControllerType_EHCI))
+        || (enmType >  USBControllerType_XHCI))
         return setError(E_INVALIDARG,
                         tr("Invalid USB controller type"));
@@ -263 +263 @@
             break;
         case USBControllerType_EHCI:
+            *aUSBStandard = 0x0200;
+            break;
+        case USBControllerType_XHCI:
             *aUSBStandard = 0x0200;
             break;

trunk/src/VBox/Main/xml/Settings.cpp

@@ -3085 +3085 @@
                         else if (strCtrlType == "EHCI")
                             ctrl.enmType = USBControllerType_EHCI;
+                        else if (strCtrlType == "XHCI")
+                            ctrl.enmType = USBControllerType_XHCI;
                         else
                             throw ConfigFileError(this, pelmCtrl, N_("Invalid value '%s' for Controller/@type attribute"), strCtrlType.c_str());
@@ -4391 +4393 @@
                     strType = "EHCI";
                     break;
+                case USBControllerType_XHCI:
+                    strType = "XHCI";
+                    break;
                 default:
                     AssertMsgFailed(("Unknown USB controller type %d\n", ctrl.enmType));