Changeset 56969 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jul 17, 2015 1:38:14 PM (10 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.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (8 diffs)
• DevVGASavedState.h (modified) (2 diffs)
• DevVGA_VBVA.cpp (modified) (7 diffs)
• DevVGA_VDMA.cpp (modified) (2 diffs)

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

@@ -5519 +5519 @@
     vga_save(pSSM, PDMINS_2_DATA(pDevIns, PVGASTATE));
 
+    VGA_SAVED_STATE_PUT_MARKER(pSSM, 1);
 #ifdef VBOX_WITH_HGSMI
     SSMR3PutBool(pSSM, true);
@@ -5528 +5529 @@
     AssertRCReturn(rc, rc);
 
+    VGA_SAVED_STATE_PUT_MARKER(pSSM, 3);
 #ifdef VBOX_WITH_VDMA
     rc = SSMR3PutU32(pSSM, 1);
@@ -5541 +5543 @@
 #endif
 
+    VGA_SAVED_STATE_PUT_MARKER(pSSM, 5);
 #ifdef VBOX_WITH_VMSVGA
     if (pThis->fVMSVGAEnabled)
@@ -5548 +5551 @@
     }
 #endif
+    VGA_SAVED_STATE_PUT_MARKER(pSSM, 6);
 
     return rc;
@@ -5585 +5589 @@
         if (RT_FAILURE(rc))
             return rc;
+
+        /*
+         * Restore the HGSMI state, if present.
+         */
+        VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pSSM, uVersion, 1);
         bool fWithHgsmi = uVersion == VGA_SAVEDSTATE_VERSION_HGSMI;
         if (uVersion > VGA_SAVEDSTATE_VERSION_HGSMI)
@@ -5601 +5610 @@
         }
 
+        VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pSSM, uVersion, 3);
         if (uVersion >= VGA_SAVEDSTATE_VERSION_3D)
         {
@@ -5622 +5632 @@
         }
 
+        VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pSSM, uVersion, 5);
 #ifdef VBOX_WITH_VMSVGA
         if (pThis->fVMSVGAEnabled)
@@ -5629 +5640 @@
         }
 #endif
+        VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pSSM, uVersion, 6);
     }
     return VINF_SUCCESS;

trunk/src/VBox/Devices/Graphics/DevVGASavedState.h

@@ -20 +20 @@
 
 
-#ifndef Graphics_DevVGASavedState_h
-#define Graphics_DevVGASavedState_h
+#ifndef ___Graphics_DevVGASavedState_h
+#define ___Graphics_DevVGASavedState_h
 
-#define VGA_SAVEDSTATE_VERSION              15
+/** Creates an eyecatching marker in the VGA saved state ("<uSub>Marker\n"). */
+#define VGA_SAVED_STATE_MAKE_MARKER(uSub) (UINT64_C(0x0a72656b72614d30) + (uint64_t)(uSub))
+
+/** Puts a marker. Status code is not checked. */
+#define VGA_SAVED_STATE_PUT_MARKER(pSSM, uSub) \
+    do { SSMR3PutU64(pSSM, VGA_SAVED_STATE_MAKE_MARKER(uSub)); } while (0)
+
+/** Retrieves a VGA saved state marker and checks that it matches, if it
+ *  doesn't assert/LogRel and return. */
+#define VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pSSM, uVersion, uSub) \
+    do { \
+        if (uVersion >= VGA_SAVEDSTATE_VERSION_MARKERS) \
+        { \
+            uint64_t uMarker; \
+            int rcMarker = SSMR3GetU64(pSSM, &uMarker); \
+            AssertLogRelRCReturn(rc, rc); \
+            AssertLogRelMsgReturn(uMarker == VGA_SAVED_STATE_MAKE_MARKER(uSub), \
+                                  ("Bad VGA marker: expected %llx, got %llx\n", VGA_SAVED_STATE_MAKE_MARKER(uSub), uMarker), \
+                                  VERR_SSM_DATA_UNIT_FORMAT_CHANGED); \
+        } \
+    } while (0)
+
+#define VGA_SAVEDSTATE_VERSION              16
+#define VGA_SAVEDSTATE_VERSION_MARKERS      16
 #define VGA_SAVEDSTATE_VERSION_MODE_HINTS   15
 #define VGA_SAVEDSTATE_VERSION_FIXED_PENDVHWA 14
@@ -41 +64 @@
 
 #endif
+

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);
                     }

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

@@ -1382 +1382 @@
                 return rc;
             }
+            VGA_SAVED_STATE_PUT_MARKER(pCmd->u.state.pSSM, 4);
+
             return pVdma->CrSrvInfo.pfnSaveState(pVdma->CrSrvInfo.hSvr, pCmd->u.state.pSSM);
         }
@@ -1396 +1398 @@
             }
 
+            VGA_SAVED_STATE_GET_MARKER_RETURN_ON_MISMATCH(pCmd->u.state.pSSM, pCmd->u.state.u32Version, 4);
             rc = pVdma->CrSrvInfo.pfnLoadState(pVdma->CrSrvInfo.hSvr, pCmd->u.state.pSSM, pCmd->u.state.u32Version);
             if (RT_FAILURE(rc))