Changeset 75448 in vbox

Timestamp:

Nov 14, 2018 1:44:39 PM (6 years ago)

Author:

vboxsync

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

126602

Message:

Main/DisplayImpl: Do much of the i_drvDestruct work earlier in the power off notification. This should help make sure IDisplay client calls doesn't make it into HGCM or DevVGA during VM destruction. bugref:9292

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -322 +322 @@
     static DECLCALLBACK(int)   i_drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
     static DECLCALLBACK(void)  i_drvDestruct(PPDMDRVINS pDrvIns);
+    static DECLCALLBACK(void)  i_drvPowerOff(PPDMDRVINS pDrvIns);
     static DECLCALLBACK(int)   i_displayResizeCallback(PPDMIDISPLAYCONNECTOR pInterface, uint32_t bpp, void *pvVRAM,
                                                        uint32_t cbLine, uint32_t cx, uint32_t cy);

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -3237 +3237 @@
 }
 #endif
-
 #ifdef VBOX_WITH_CRHGSMI
+
 void Display::i_setupCrHgsmiData(void)
 {
@@ -3286 +3286 @@
     RTCritSectRwLeaveExcl(&mCrOglLock);
 }
+
 #endif /* VBOX_WITH_CRHGSMI */
 
@@ -4476 +4477 @@
 
 /**
- * Destruct a display driver instance.
- *
- * @returns VBox status code.
- * @param   pDrvIns     The driver instance data.
+ * @interface_method_impl{PDMDRVREG,pfnPowerOff,
+ *  Tries to ensure no client calls gets to HGCM or the VGA device from here on.}
  */
-DECLCALLBACK(void) Display::i_drvDestruct(PPDMDRVINS pDrvIns)
-{
-    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
+DECLCALLBACK(void) Display::i_drvPowerOff(PPDMDRVINS pDrvIns)
+{
     PDRVMAINDISPLAY pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
     LogRelFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
 
-    pThis->pUpPort->pfnSetRenderVRAM(pThis->pUpPort, false);
+    /*
+     * Do much of the work that i_drvDestruct does.
+     */
+    if (pThis->pUpPort)
+        pThis->pUpPort->pfnSetRenderVRAM(pThis->pUpPort, false);
 
     pThis->IConnector.pbData     = NULL;
@@ -4504 +4506 @@
         pThis->pDisplay->i_destructCrHgsmiData();
 #endif
+#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)
+        pThis->pVBVACallbacks = NULL;
+#endif
+    }
+}
+
+
+/**
+ * Destruct a display driver instance.
+ *
+ * @returns VBox status code.
+ * @param   pDrvIns     The driver instance data.
+ */
+DECLCALLBACK(void) Display::i_drvDestruct(PPDMDRVINS pDrvIns)
+{
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
+    PDRVMAINDISPLAY pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINDISPLAY);
+    LogRelFlowFunc(("iInstance=%d\n", pDrvIns->iInstance));
+
+    /*
+     * We repeat much of what i_drvPowerOff does in case it wasn't called.
+     * In addition we sever the connection between us and the display.
+     */
+    if (pThis->pUpPort)
+        pThis->pUpPort->pfnSetRenderVRAM(pThis->pUpPort, false);
+
+    pThis->IConnector.pbData     = NULL;
+    pThis->IConnector.cbScanline = 0;
+    pThis->IConnector.cBits      = 32;
+    pThis->IConnector.cx         = 0;
+    pThis->IConnector.cy         = 0;
+
+    if (pThis->pDisplay)
+    {
+        AutoWriteLock displayLock(pThis->pDisplay COMMA_LOCKVAL_SRC_POS);
+#ifdef VBOX_WITH_RECORDING
+        pThis->pDisplay->mParent->i_recordingStop();
+#endif
+#ifdef VBOX_WITH_CRHGSMI
+        pThis->pDisplay->i_destructCrHgsmiData();
+#endif
+#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)
+        pThis->pVBVACallbacks = NULL;
+#endif
+
         pThis->pDisplay->mpDrv = NULL;
-    }
+        pThis->pDisplay = NULL;
+    }
+#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)
+    pThis->pVBVACallbacks = NULL;
+#endif
 }
 
@@ -4657 +4708 @@
     NULL,
     /* pfnPowerOff */
-    NULL,
+    Display::i_drvPowerOff,
     /* pfnSoftReset */
     NULL,