Changeset 98122 in vbox for trunk/src/VBox/VMM/VMMR3

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.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PDM.cpp (modified) (1 diff)
• PDMUsb.cpp (modified) (5 diffs)

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

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

@@ -547 +547 @@
                                 PCFGMNODE *ppInstanceNode, VUSBSPEED enmSpeed, const char *pszCaptureFilename)
 {
-    const bool fAtRuntime = iInstance == -1;
     int rc;
 
@@ -568 +567 @@
     PCFGMNODE pInstanceToDelete = NULL;
     PCFGMNODE pInstanceNode = NULL;
-    if (fAtRuntime)
+    if (iInstance == -1)
     {
         /** @todo r=bird: This code is bogus as it ASSUMES that all USB devices are
@@ -646 +645 @@
     //pUsbIns->Internal.s.pHub                = NULL;
     pUsbIns->Internal.s.iPort               = UINT32_MAX; /* to be determined. */
-    /* Set the flag accordingly.
-     * Otherwise VMPowerOff, VMSuspend will not be called for devices attached at runtime.
-     */
-    pUsbIns->Internal.s.fVMSuspended        = !fAtRuntime;
+    VMSTATE const enmVMState = VMR3GetState(pVM);
+    pUsbIns->Internal.s.fVMSuspended        = !VMSTATE_IS_POWERED_ON(enmVMState);
     //pUsbIns->Internal.s.pfnAsyncNotify      = NULL;
     pUsbIns->pHlpR3                         = &g_pdmR3UsbHlp;
@@ -712 +709 @@
 
             /* Send the hot-plugged notification if applicable. */
-            if (fAtRuntime && pUsbIns->pReg->pfnHotPlugged)
+            if (VMSTATE_IS_POWERED_ON(enmVMState) && pUsbIns->pReg->pfnHotPlugged)
                 pUsbIns->pReg->pfnHotPlugged(pUsbIns);
 
@@ -729 +726 @@
             rc = VERR_PDM_USBDEV_VERSION_MISMATCH;
     }
-    if (fAtRuntime)
+    if (VMSTATE_IS_POWERED_ON(enmVMState))
         pdmR3UsbDestroyDevice(pVM, pUsbIns);
     /* else: destructors are invoked later. */