Changeset 98122 in vbox for trunk/src/VBox/VMM/VMMR3/PDM.cpp

Timestamp:

Jan 19, 2023 12:03:23 AM (2 years ago)

Author:

vboxsync

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

155291

Message:

VMM/PDM: Fixed assertion in PDMR3ResumeUsb after attaching a virtual MSD.

File:

• trunk/src/VBox/VMM/VMMR3/PDM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PDM.cpp

@@ -2121 +2121 @@
 DECLINLINE(int) pdmR3ResumeUsb(PPDMUSBINS pUsbIns)
 {
-    Assert(pUsbIns->Internal.s.fVMSuspended);
-    if (pUsbIns->pReg->pfnVMResume)
-    {
-        LogFlow(("PDMR3Resume: Notifying - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance));
-        int rc = VINF_SUCCESS; pUsbIns->pReg->pfnVMResume(pUsbIns);
-        if (RT_FAILURE(rc))
-        {
-            LogRel(("PDMR3Resume: Device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
-            return rc;
-        }
-    }
-    pUsbIns->Internal.s.fVMSuspended = false;
+    if (pUsbIns->Internal.s.fVMSuspended)
+    {
+        if (pUsbIns->pReg->pfnVMResume)
+        {
+            LogFlow(("PDMR3Resume: Notifying - device '%s'/%d\n", pUsbIns->pReg->szName, pUsbIns->iInstance));
+            int rc = VINF_SUCCESS; pUsbIns->pReg->pfnVMResume(pUsbIns);
+            if (RT_FAILURE(rc))
+            {
+                LogRel(("PDMR3Resume: Device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
+                return rc;
+            }
+        }
+        pUsbIns->Internal.s.fVMSuspended = false;
+    }
     return VINF_SUCCESS;
 }