Changeset 57994 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Oct 1, 2015 7:56:39 PM (9 years ago)

Author:

vboxsync

Message:

HostUSBDeviceImpl: Fixed wrong state transition in i_failTransition when the device reappers but is not actually captured as we expect.

File:

• trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp (modified) (11 diffs)

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

@@ -455 +455 @@
     {
         alock.acquire();
-        i_failTransition();
+        i_failTransition(kHostUSBDeviceState_Invalid);
         mMachine.setNull();
         if (rc == VERR_SHARING_VIOLATION)
@@ -714 +714 @@
     {
         alock.acquire();
-        i_failTransition();
+        i_failTransition(kHostUSBDeviceState_Invalid);
         return E_FAIL;
     }
@@ -767 +767 @@
     {
         alock.acquire();
-        i_failTransition();
+        i_failTransition(kHostUSBDeviceState_Invalid);
         return E_FAIL;
     }
@@ -814 +814 @@
                     {
                         LogRel(("USB: Async operation timed out for device %s (state: %s)\n", mName, i_getStateName()));
-                        i_failTransition();
+                        i_failTransition(kHostUSBDeviceState_PhysDetached);
                     }
 #endif
@@ -1196 +1196 @@
                     /* Can only mean that we've failed capturing it. */
                     case kHostUSBDeviceState_Capturing:
-                        LogThisFunc(("{%s} capture failed!\n", mName));
+                        LogThisFunc(("{%s} capture failed! (#1)\n", mName));
                         mUSBProxyService->captureDeviceCompleted(this, false /* aSuccess */);
-                        *aRunFilters = i_failTransition();
+                        *aRunFilters = i_failTransition(kHostUSBDeviceState_UsedByHost);
                         mMachine.setNull();
                         break;
@@ -1264 +1264 @@
                     /* Can only mean that we've failed capturing it. */
                     case kHostUSBDeviceState_Capturing:
-                        LogThisFunc(("{%s} capture failed!\n", mName));
+                        LogThisFunc(("{%s} capture failed! (#2)\n", mName));
                         mUSBProxyService->captureDeviceCompleted(this, false /* aSuccess */);
-                        *aRunFilters = i_failTransition();
+                        *aRunFilters = i_failTransition(kHostUSBDeviceState_Capturable);
                         mMachine.setNull();
                         break;
@@ -1332 +1332 @@
 #endif
                         {
-                            LogThisFunc(("{%s} capture failed!\n", mName));
+                            LogThisFunc(("{%s} capture failed! (#3)\n", mName));
                             mUSBProxyService->captureDeviceCompleted(this, false /* aSuccess */);
-                            *aRunFilters = i_failTransition();
+                            *aRunFilters = i_failTransition(kHostUSBDeviceState_Unused);
                             mMachine.setNull();
                         }
@@ -1469 +1469 @@
              && i_hasAsyncOperationTimedOut())
     {
-        LogRel(("USB: timeout in %s for {%RTuuid} / {%s}\n",
-                i_getStateName(), mId.raw(), mName));
-        *aRunFilters = i_failTransition();
+        LogRel(("USB: timeout in %s for {%RTuuid} / {%s}\n", i_getStateName(), mId.raw(), mName));
+        *aRunFilters = i_failTransition(kHostUSBDeviceState_Invalid);
         fIsImportant = true;
     }
@@ -2019 +2018 @@
                 case kHostUSBDeviceState_Capturable:
                 case kHostUSBDeviceState_Unused:
-                    Assert(aNewState == mPrevUniState);
+                    Assert(aNewState == mPrevUniState); /** @todo This is kind of wrong, see i_failTransition. */
                     Assert(aNewPendingState == kHostUSBDeviceState_Invalid);
                     Assert(aNewSubState == kHostUSBDeviceSubState_Default);
@@ -2412 +2411 @@
  *
  * @return true if filters should be applied to the device, false if not.
+ * @param   a_enmStateHint  USB device state hint. kHostUSBDeviceState_Invalid
+ *                          if the caller doesn't have a clue to give.
  *
  * @note    The caller must own the write lock for this object.
  */
-bool HostUSBDevice::i_failTransition()
+bool HostUSBDevice::i_failTransition(HostUSBDeviceState a_enmStateHint)
 {
     AssertReturn(isWriteLockOnCurrentThread(), false);
@@ -2441 +2442 @@
                 case kHostUSBDeviceSubState_AwaitingReAttach:
                     enmSub = kHostUSBDeviceSubState_Default;
-                    enmState = kHostUSBDeviceState_PhysDetached;
+                    if (a_enmStateHint != kHostUSBDeviceState_Invalid)
+                        enmState = mPrevUniState; /** @todo enmState = a_enmStateHint is more correct, but i_setState doesn't like it. It will usually correct itself shortly. */
+                    else
+                        enmState = kHostUSBDeviceState_PhysDetached;
                     break;
                 default: