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

Timestamp:

Jul 23, 2013 1:59:12 PM (11 years ago)

Author:

vboxsync

Message:

Main: Cache information about USB controller availability locally in Console object.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (6 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -786 +786 @@
     /** true if we already listed the disk type of the snapshot folder. */
     bool mfSnapshotFolderDiskTypeShown : 1;
+    /** true if a USB controller is available (i.e. USB devices can be attached). */
+    bool mfVMHasUsbController : 1;
 
     /** Pointer to the VMM -> User (that's us) callbacks. */

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

@@ -381 +381 @@
     , mfSnapshotFolderExt4WarningShown(false)
     , mfSnapshotFolderDiskTypeShown(false)
+    , mfVMHasUsbController(false)
     , mpVmm2UserMethods(NULL)
     , m_pVMMDev(NULL)
@@ -2848 +2849 @@
         return ptrVM.rc();
 
-    /* Don't proceed unless we've found the usb controller. */
-    PPDMIBASE pBase = NULL;
-    int vrc = PDMR3QueryLun(ptrVM.rawUVM(), "usb-ohci", 0, 0, &pBase);
-    if (RT_FAILURE(vrc))
+    /* Don't proceed unless we have a USB controller. */
+    if (!mfVMHasUsbController)
         return setError(VBOX_E_PDM_ERROR,
             tr("The virtual machine does not have a USB controller"));
@@ -7137 +7136 @@
     if (RT_SUCCESS(vrc) || autoCaller.state() == InUninit)
     {
-        /* If the machine has an USB controller, release all USB devices
+        /* If the machine has a USB controller, release all USB devices
          * (symmetric to the code in captureUSBDevices()) */
-        bool fHasUSBController = false;
-        {
-            PPDMIBASE pBase;
-            vrc = PDMR3QueryLun(pUVM, "usb-ohci", 0, 0, &pBase);
-            if (RT_SUCCESS(vrc))
-            {
-                fHasUSBController = true;
-                alock.release();
-                detachAllUSBDevices(false /* aDone */);
-                alock.acquire();
-            }
+        if (mfVMHasUsbController)
+        {
+            alock.release();
+            detachAllUSBDevices(false /* aDone */);
+            alock.acquire();
         }
 
@@ -7200 +7193 @@
 
         /* Complete the detaching of the USB devices. */
-        if (fHasUSBController)
+        if (mfVMHasUsbController)
         {
             alock.release();
@@ -8652 +8645 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* If the machine has an USB controller, ask the USB proxy service to
+    /* If the machine has a USB controller, ask the USB proxy service to
      * capture devices */
-    PPDMIBASE pBase;
-    int vrc = PDMR3QueryLun(pUVM, "usb-ohci", 0, 0, &pBase);
-    if (RT_SUCCESS(vrc))
+    if (mfVMHasUsbController)
     {
         /* release the lock before calling Host in VBoxSVC since Host may call
@@ -8666 +8657 @@
         ComAssertComRCRetRC(hrc);
     }
-    else if (   vrc == VERR_PDM_DEVICE_NOT_FOUND
-             || vrc == VERR_PDM_DEVICE_INSTANCE_NOT_FOUND)
-        vrc = VINF_SUCCESS;
-    else
-        AssertRC(vrc);
-
-    return RT_SUCCESS(vrc) ? S_OK : E_FAIL;
+
+    return S_OK;
 }
 

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

@@ -2290 +2290 @@
                 attachStatusDriver(pInst, &mapUSBLed[0], 0, 0, NULL, NULL, 0);
 
+                mfVMHasUsbController = true;
 #ifdef VBOX_WITH_EHCI
                 BOOL fEHCIEnabled;