Changeset 100779 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 2, 2023 1:39:17 PM (20 months ago)

Author:

vboxsync

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

158660

Message:

DrvVUSBRootHub: Don't arm a re-attach timer in vusbR3RhLoadDone when saved state loading failed, just re-attach immediately so it won't cause trouble later during VM termination & cleanup. bugref:10494

File:

• trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp (modified) (1 diff)

trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp

@@ -1513 +1513 @@
     if (pLoad)
     {
-        int rc = PDMDrvHlpTMTimerCreate(pDrvIns, TMCLOCK_VIRTUAL, vusbR3RhLoadReattachDevices, NULL,
+        int rc = PDMDrvHlpSSMHandleGetStatus(pDrvIns, pSSM);
+        if (RT_SUCCESS(rc))
+        {
+            rc = PDMDrvHlpTMTimerCreate(pDrvIns, TMCLOCK_VIRTUAL, vusbR3RhLoadReattachDevices, NULL,
                                         TMTIMER_FLAGS_NO_CRIT_SECT | TMTIMER_FLAGS_NO_RING0,
                                         "VUSB reattach on load", &pLoad->hTimer);
-        AssertLogRelRC(rc);
-        if (RT_SUCCESS(rc))
-            rc = PDMDrvHlpTimerSetMillies(pDrvIns, pLoad->hTimer, 250);
+            AssertLogRelRC(rc);
+            if (RT_SUCCESS(rc))
+            {
+                rc = PDMDrvHlpTimerSetMillies(pDrvIns, pLoad->hTimer, 250);
+                if (RT_SUCCESS(rc))
+                    return VINF_SUCCESS;
+            }
+        }
         else
-            vushR3RhFreeLoadData(pThis, pDrvIns); /** @todo or call vusbR3RhLoadReattachDevices directly then fail? */
+            rc = VINF_SUCCESS;
+        vushR3RhFreeLoadData(pThis, pDrvIns); /** @todo or call vusbR3RhLoadReattachDevices directly then fail? */
         return rc;
     }