Changeset 56785 in vbox for trunk/src/VBox

Timestamp:

Jul 3, 2015 1:56:23 PM (10 years ago)

Author:

vboxsync

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

101435

Message:

DevVGA: correctly restore VBVA state.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -569 +569 @@
     }
 
-    if (   parms.off32Data != 0
-        || parms.off32Free != 0
-        || parms.indexRecordFirst != 0
-        || parms.indexRecordFree != 0
-        || parms.cbPartialWriteThreshold >= parms.cbData
+    if (!fRestored)
+    {
+        if (   parms.off32Data != 0
+            || parms.off32Free != 0
+            || parms.indexRecordFirst != 0
+            || parms.indexRecordFree != 0)
+        {
+            return VERR_INVALID_PARAMETER;
+        }
+    }
+
+    if (   parms.cbPartialWriteThreshold >= parms.cbData
         || parms.cbPartialWriteThreshold == 0)
     {
@@ -599 +606 @@
         pVBVAData->guest.pu8Data           = &pVBVA->au8Data[0];
         pVBVAData->u32VBVAOffset           = u32Offset;
-        pVBVAData->off32Data               = 0;
-        pVBVAData->indexRecordFirst        = 0;
+        pVBVAData->off32Data               = parms.off32Data;
+        pVBVAData->indexRecordFirst        = parms.indexRecordFirst;
         pVBVAData->cbPartialWriteThreshold = parms.cbPartialWriteThreshold;
         pVBVAData->cbData                  = parms.cbData;