Changeset 56969 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

Timestamp:

Jul 17, 2015 1:38:14 PM (9 years ago)

Author:

vboxsync

Message:

DevVGA: Added markers to the saved state that separates various parts so we can more easily pin down load troubles when reading the log file.

File:

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

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

@@ -1603 +1603 @@
     if (RT_SUCCESS(rc))
     {
+        VGA_SAVED_STATE_PUT_MARKER(pSSM, 2);
+
         /* Save VBVACONTEXT. */
         VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext (pIns);
@@ -1781 +1783 @@
 }
 
-int vboxVBVALoadStateExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t u32Version)
-{
-    if (u32Version < VGA_SAVEDSTATE_VERSION_HGSMI)
+int vboxVBVALoadStateExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion)
+{
+    if (uVersion < VGA_SAVEDSTATE_VERSION_HGSMI)
     {
         /* Nothing was saved. */
@@ -1791 +1793 @@
     PVGASTATE pVGAState = PDMINS_2_DATA(pDevIns, PVGASTATE);
     PHGSMIINSTANCE pIns = pVGAState->pHGSMI;
-    int rc = HGSMIHostLoadStateExec (pIns, pSSM, u32Version);
+    int rc = HGSMIHostLoadStateExec (pIns, pSSM, uVersion);
     if (RT_SUCCESS(rc))
     {
+        VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pSSM, uVersion, 2);
+
         /* Load VBVACONTEXT. */
         VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext (pIns);
@@ -1879 +1883 @@
             }
 
-            if (u32Version > VGA_SAVEDSTATE_VERSION_WITH_CONFIG)
+            if (uVersion > VGA_SAVEDSTATE_VERSION_WITH_CONFIG)
             {
                 /* Read mouse pointer shape information. */
@@ -1933 +1937 @@
                 }
 
-                if (u32Version >= VGA_SAVEDSTATE_VERSION_MODE_HINTS)
+                if (uVersion >= VGA_SAVEDSTATE_VERSION_MODE_HINTS)
                 {
                     uint32_t cModeHints, cbModeHints;
@@ -1958 +1962 @@
             LogFlowFunc(("%d views loaded\n", pCtx->cViews));
 
-            if (u32Version > VGA_SAVEDSTATE_VERSION_WDDM)
+            if (uVersion > VGA_SAVEDSTATE_VERSION_WDDM)
             {
                 bool fLoadCommands;
 
-                if (u32Version < VGA_SAVEDSTATE_VERSION_FIXED_PENDVHWA)
+                if (uVersion < VGA_SAVEDSTATE_VERSION_FIXED_PENDVHWA)
                 {
                     const char *pcszOsArch = SSMR3HandleHostOSAndArch(pSSM);
@@ -1988 +1992 @@
                     if (fLoadCommands)
                     {
-                        rc = vbvaVHWACommandLoadPending(pVGAState, pSSM, u32Version);
+                        rc = vbvaVHWACommandLoadPending(pVGAState, pSSM, uVersion);
                         AssertRCReturn(rc, rc);
                     }