Changeset 100779 in vbox

Timestamp:

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

Author:

vboxsync

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

Location:

trunk

Files:

• include/VBox/vmm/pdmdrv.h (modified) (1 diff)
• src/VBox/Devices/USB/DrvVUSBRootHub.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmdrv.h

@@ -1827 +1827 @@
 
 /**
+ * Get the status of an saved state operation.
+ *
+ * This can sometimes be useful in FNSSMDRVLOADDONE implementations to determine
+ * whether the load succeeded or not.
+ *
+ * @returns VBox status.
+ * @param   pDrvIns         Driver instance.
+ * @param   pSSM            The saved state handle.
+ * @sa      SSMR3HandleGetStatus
+ */
+DECLINLINE(int) PDMDrvHlpSSMHandleGetStatus(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM)
+{
+    return pDrvIns->pHlpR3->pfnSSMHandleGetStatus(pSSM);
+}
+
+/**
  * @copydoc PDMDRVHLPR3::pfnMMHeapFree
  */

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;
     }