Changeset 34897 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2010 3:11:06 PM (14 years ago)

Author:

vboxsync

Message:

Blessed the USB 2.0 config hack and fixed the assertion in ExtPackManager::Find() caused by it.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (3 diffs)
• ExtPackManagerImpl.cpp (modified) (1 diff)
• include/ExtPackManagerImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2042 +2042 @@
 
                 /*
-                * Attach the status driver.
-                */
+                 * Attach the status driver.
+                 */
                 InsertConfigNode(pInst,    "LUN#999", &pLunL0);
                 InsertConfigString(pLunL0, "Driver",               "MainStatus");
@@ -2056 +2056 @@
                 if (fEhciEnabled)
                 {
-                    /* USB 2.0 is only available if the proper ExtPack is installed. */
-                    Bstr USBExtPackName("Oracle VM VirtualBox Extension Pack");
-                    ComPtr<IExtPack> ExtPack;
-                    hrc = pConsole->mptrExtPackManager->Find(USBExtPackName.raw(),
-                                                             ExtPack.asOutParam());
-                    if (SUCCEEDED(hrc))
+                    /*
+                     * USB 2.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";
+                    if (pConsole->mptrExtPackManager->isExtPackUsable(s_pszUsbExtPackName))
                     {
                         InsertConfigNode(pDevices, "usb-ehci", &pDev);
@@ -2085 +2089 @@
                     else
                     {
+                        /* Fatal if a saved state is being restored, otherwise ignorable. */
                         if (pConsole->mMachineState == MachineState_Restoring)
-                        {
-                            /* fatal */ 
                             return VMSetError(pVM, VERR_NOT_FOUND, RT_SRC_POS,
                                     N_("Implementation of the USB 2.0 controller not found!\n"
                                        "Because the USB 2.0 controller state is part of the saved "
                                        "VM state, the VM cannot be started. To fix "
-                                       "this problem, either install the '%lS' or disable USB 2.0 "
+                                       "this problem, either install the '%s' or disable USB 2.0 "
                                        "support in the VM settings"),
-                                       USBExtPackName.raw());
-                        }
-                        else
-                        {
-                            /* not fatal */
-                            setVMRuntimeErrorCallbackF(pVM, pConsole, 0,
-                                    "ExtPackNoEhci",
-                                    N_("Implementation of the USB 2.0 controller not found!\n"
-                                       "The device will be disabled. You can ignore this warning "
-                                       "but there will be no USB 2.0 support in your VM. To fix "
-                                       "this issue, either install the '%lS' or disable USB 2.0 "
-                                       "support in the VM settings"),
-                                       USBExtPackName.raw());
-                        }
+                                    s_pszUsbExtPackName);
+                        setVMRuntimeErrorCallbackF(pVM, pConsole, 0, "ExtPackNoEhci",
+                                N_("Implementation of the USB 2.0 controller not found!\n"
+                                   "The device will be disabled. You can ignore this warning "
+                                   "but there will be no USB 2.0 support in your VM. To fix "
+                                   "this issue, either install the '%s' or disable USB 2.0 "
+                                   "support in the VM settings"),
+                                s_pszUsbExtPackName);
                     }
                 }

trunk/src/VBox/Main/ExtPackManagerImpl.cpp

@@ -2692 +2692 @@
 }
 
+/**
+ * Checks if an extension pack is (present and) usable.
+ *
+ * @returns @c true if it is, otherwise @c false.
+ * @param   a_pszExtPack    The name of the extension pack.
+ */
+bool ExtPackManager::isExtPackUsable(const char *a_pszExtPack)
+{
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (FAILED(hrc))
+        return false;
+    AutoReadLock autoLock(this COMMA_LOCKVAL_SRC_POS);
+
+    ExtPack *pExtPack = findExtPack(a_pszExtPack);
+    return pExtPack != NULL
+        && pExtPack->m->fUsable;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/include/ExtPackManagerImpl.h

@@ -228 +228 @@
     int         getVrdeLibraryPathForExtPack(Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrVrdeLibrary);
     HRESULT     getDefaultVrdeExtPack(Utf8Str *a_pstrExtPack);
+    bool        isExtPackUsable(const char *a_pszExtPack);
     /** @}  */