Changeset 8484 in vbox for trunk/src/VBox

Timestamp:

Apr 30, 2008 12:12:33 AM (17 years ago)

Author:

vboxsync

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

30356

Message:

Darwin USB fixes.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (3 diffs)
• darwin/iokit.cpp (modified) (1 diff)
• include/HostImpl.h (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1481 +1481 @@
  *  to the new locking scheme).
  */
-HRESULT Host::detachAllUSBDevices (SessionMachine *aMachine, BOOL aDone)
+HRESULT Host::detachAllUSBDevices (SessionMachine *aMachine, BOOL aDone, bool aAbnormal)
 {
     AutoWriteLock alock (this);
@@ -1500 +1500 @@
              */
             bool fRunFilters = false;
-            HRESULT hrc = device->onDetachFromVM(aMachine, aDone, &fRunFilters);
+            HRESULT hrc = device->onDetachFromVM(aMachine, aDone, &fRunFilters, aAbnormal);
             if (    SUCCEEDED(hrc)
                 &&  fRunFilters)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7401 +7401 @@
     }
 
+#ifdef VBOX_WITH_USB
     /* release all captured USB devices */
     if (aReason == Uninit::Abnormal && lastState >= MachineState_Running)
@@ -7408 +7409 @@
          * Console::detachAllUSBDevices() will be called upon successful
          * termination. So, we need to release USB devices only if there was
-         * an abnormal termination of a running VM. */
-        DetachAllUSBDevices (TRUE /* aDone */);
-    }
+         * an abnormal termination of a running VM.
+         *
+         * This is identical to SessionMachine::DetachAllUSBDevices except
+         * for the aAbnormal argument. */
+        HRESULT rc = mUSBController->notifyProxy (false /* aInsertFilters */);
+        AssertComRC (rc);
+        NOREF (rc);
+
+        mParent->host()->detachAllUSBDevices (this, true /* aDone */, true /* aAbnormal */);
+    }
+#endif /* VBOX_WITH_USB */
 
     if (!mData->mSession.mType.isNull())
@@ -7682 +7691 @@
     NOREF (rc);
 
-    return mParent->host()->detachAllUSBDevices (this, aDone);
+    return mParent->host()->detachAllUSBDevices (this, aDone, false /* aAbnormal */);
 #else
     return S_OK;

trunk/src/VBox/Main/darwin/iokit.cpp

@@ -1108 +1108 @@
                  */
                 irc = (*ppDevI)->USBDeviceReEnumerate(ppDevI, 0);
-                if (irc != kIOReturnSuccess)
+                if (irc == kIOReturnSuccess)
+                    vrc = VINF_SUCCESS;
+                else
                 {
                     LogRel(("USB: Failed to open device '%s', plug-in creation failed with irc=%#x.\n", pszAddress, irc));

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

@@ -117 +117 @@
     HRESULT detachUSBDevice (SessionMachine *aMachine, INPTR GUIDPARAM aId, BOOL aDone);
     HRESULT autoCaptureUSBDevices (SessionMachine *aMachine);
-    HRESULT detachAllUSBDevices (SessionMachine *aMachine, BOOL aDone);
+    HRESULT detachAllUSBDevices (SessionMachine *aMachine, BOOL aDone, bool aAbnormal);
 
     void onUSBDeviceAttached (HostUSBDevice *aDevice);