Changeset 52667 in vbox

Timestamp:

Sep 10, 2014 8:40:37 AM (10 years ago)

Author:

vboxsync

Message:

DisplayImpl,VMMDev: cleaned up reenabling of the legacy video acceleration when VM is restored from saved state.

Location:

trunk/src/VBox

Files:

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

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -3444 +3444 @@
     }
 
-    /* Reestablish the acceleration status. */
-    if (    pThis->u32VideoAccelEnabled
-        &&  pThis->pDrv)
-    {
-        pThis->pDrv->pfnVideoAccelEnable(pThis->pDrv, !!pThis->u32VideoAccelEnabled, &pThis->pVMMDevRAMR3->vbvaMemory);
-    }
-
     if (pThis->fu32AdditionsOk)
     {
@@ -3497 +3490 @@
     AssertLogRelRCReturn(rc, rc);
 #endif /* VBOX_WITH_HGCM */
+
+    /* Reestablish the acceleration status. */
+    if (    pThis->u32VideoAccelEnabled
+        &&  pThis->pDrv)
+    {
+        pThis->pDrv->pfnVideoAccelEnable(pThis->pDrv, !!pThis->u32VideoAccelEnabled, &pThis->pVMMDevRAMR3->vbvaMemory);
+    }
 
     VMMDevNotifyGuest(pThis, VMMDEV_EVENT_RESTORED);

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

@@ -355 +355 @@
     int32_t volatile mcVideoAccelVRDPRefs;
 
-    VBVAMEMORY *mpPendingVbvaMemory;
-    bool        mfPendingVideoAccelEnable;
-    bool        mfMachineRunning;
 #ifdef VBOX_WITH_CROGL
     bool        mfCrOglDataHidden;

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

@@ -108 +108 @@
     mcVideoAccelVRDPRefs = 0;
 
-    mpPendingVbvaMemory = NULL;
-    mfPendingVideoAccelEnable = false;
-
-    mfMachineRunning = false;
 #ifdef VBOX_WITH_CROGL
     mfCrOglDataHidden = false;
@@ -1617 +1613 @@
         return VERR_NOT_SUPPORTED;
 
-    /*
-     * Verify that the VM is in running state. If it is not,
-     * then this must be postponed until it goes to running.
-     */
-    if (!mfMachineRunning)
-    {
-        Assert (!mfVideoAccelEnabled);
-
-        LogRelFlowFunc(("Machine is not yet running.\n"));
-
-        if (fEnable)
-        {
-            mfPendingVideoAccelEnable = fEnable;
-            mpPendingVbvaMemory = pVbvaMemory;
-        }
-
-        return rc;
-    }
-
     /* Check that current status is not being changed */
     if (mfVideoAccelEnabled == fEnable)
@@ -2171 +2148 @@
     videoAccelEnterVGA();
 
-    if (mfPendingVideoAccelEnable)
-    {
-        /* Acceleration was enabled while machine was not yet running
-         * due to restoring from saved state. Actually enable acceleration.
-         */
-        Assert(mpPendingVbvaMemory);
-
-        /* Acceleration can not be yet enabled.*/
-        Assert(mpVbvaMemory == NULL);
-        Assert(!mfVideoAccelEnabled);
-
-        if (mfMachineRunning)
-        {
-            i_videoAccelEnable(mfPendingVideoAccelEnable,
-                               mpPendingVbvaMemory);
-
-            /* Reset the pending state. */
-            mfPendingVideoAccelEnable = false;
-            mpPendingVbvaMemory = NULL;
-        }
-
-        rc = VINF_TRY_AGAIN;
-    }
-    else
-    {
-        Assert(mpPendingVbvaMemory == NULL);
-
-        if (mfVideoAccelEnabled)
-        {
-            Assert(mpVbvaMemory);
-            rc = i_videoAccelFlush();
-            if (RT_FAILURE(rc))
-            {
-                /* Disable on errors. */
-                i_videoAccelEnable(false, NULL);
-                rc = VWRN_INVALID_STATE; /* Do a display update in VGA device. */
-            }
-            else
-            {
-                rc = VINF_SUCCESS;
-            }
+    if (mfVideoAccelEnabled)
+    {
+        Assert(mpVbvaMemory);
+        rc = i_videoAccelFlush();
+        if (RT_FAILURE(rc))
+        {
+            /* Disable on errors. */
+            i_videoAccelEnable(false, NULL);
+            rc = VWRN_INVALID_STATE; /* Do a display update in VGA device. */
+        }
+        else
+        {
+            rc = VINF_SUCCESS;
         }
     }
@@ -3524 +3473 @@
                 LogRelFlowFunc(("Machine is running.\n"));
 
-                mfMachineRunning = true;
-
 #ifdef VBOX_WITH_CROGL
                 i_crOglWindowsShow(true);
@@ -3532 +3479 @@
             else
             {
-                mfMachineRunning = false;
-
 #ifdef VBOX_WITH_CROGL
                 if (machineState == MachineState_Paused)