Changeset 55970 in vbox

Timestamp:

May 20, 2015 3:16:16 PM (10 years ago)

Author:

vboxsync

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

100475

Message:

VMM/PDM: Change PDMR3PowerOff to always call the power off notification for all devices and attached drivers even if they were suspended with PDMR3Suspend before (see xTracker #6567)

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (1 diff)
• include/VBox/vmm/pdmdrv.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDM.cpp (modified) (1 diff)
• src/VBox/VMM/include/PDMInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/pdmdev.h

@@ -161 +161 @@
  * Power Off notification.
  *
- * This is only called when the VMR3PowerOff call is made on a running VM.  This
- * means that there is no notification if the VM was suspended before being
- * powered off.  There will also be no callback when hot plugging devices.
+ * This is always called when VMR3PowerOff is called.
+ * There will be no callback when hot plugging devices.
  *
  * @param   pDevIns     The device instance data.

trunk/include/VBox/vmm/pdmdrv.h

@@ -175 +175 @@
  * Power Off notification.
  *
- * This is only called when the VMR3PowerOff call is made on a running VM. This
- * means that there is no notification if the VM was suspended before being
- * powered of.  There will also be no callback when hot plugging devices or when
- * replumbing the driver stack.
+ * This is always called when VMR3PowerOff is called.
+ * There will be no callback when hot plugging devices or when replumbing the driver
+ * stack.
  *
  * @param   pDrvIns     The driver instance data.

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

@@ -2101 +2101 @@
     LogFlow(("PDMR3PowerOff:\n"));
     uint64_t cNsElapsed = RTTimeNanoTS();
+
+    /*
+     * Clear the suspended flags on all devices and drivers first because they
+     * might have been set during a suspend but the power off callbacks should
+     * be called in any case.
+     */
+    for (PPDMDEVINS pDevIns = pVM->pdm.s.pDevInstances; pDevIns; pDevIns = pDevIns->Internal.s.pNextR3)
+    {
+        pDevIns->Internal.s.fIntFlags &= ~PDMDEVINSINT_FLAGS_SUSPENDED;
+
+        for (PPDMLUN pLun = pDevIns->Internal.s.pLunsR3; pLun; pLun = pLun->pNext)
+            for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown)
+                pDrvIns->Internal.s.fVMSuspended = false;
+    }
+
+#ifdef VBOX_WITH_USB
+    for (PPDMUSBINS pUsbIns = pVM->pdm.s.pUsbInstances; pUsbIns; pUsbIns = pUsbIns->Internal.s.pNext)
+    {
+        pUsbIns->Internal.s.fVMSuspended = false;
+
+        for (PPDMLUN pLun = pUsbIns->Internal.s.pLuns; pLun; pLun = pLun->pNext)
+            for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown)
+                pDrvIns->Internal.s.fVMSuspended = false;
+    }
+#endif
 
     /*

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -176 +176 @@
  * to make sure each device gets exactly one notification for each of those
  * events.  PDMR3Resume and PDMR3PowerOn also makes use of it to bail out on
- * a failure (already resumed/powered-on devices are suspended). */
+ * a failure (already resumed/powered-on devices are suspended).
+ * PDMR3PowerOff resets this flag once before going through the devices to make sure
+ * every device gets the power off notification even if it was suspended before with
+ * PDMR3Suspend.
+ */
 #define PDMDEVINSINT_FLAGS_SUSPENDED     RT_BIT_32(1)
 /** Indicates that the device has been reset already.  Used by PDMR3Reset. */