Changeset 49247 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 22, 2013 8:36:41 PM (11 years ago)

Author:

vboxsync

Message:

PATM,CSAM,SSM: Fix PATM restore issue in 4.3.0. SSMSTRUCT_FLAGS_MEM_BAND_AID policy update.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CSAM.cpp (modified) (3 diffs)
• PATMSSM.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -604 +604 @@
      * Restore CSAM structure
      */
-#if 0
-    rc = SSMR3GetMem(pSSM, &csamInfo, sizeof(csamInfo));
-#else
     RT_ZERO(csamInfo);
-    rc = SSMR3GetStructEx(pSSM, &csamInfo, sizeof(csamInfo), SSMSTRUCT_FLAGS_MEM_BAND_AID, &g_aCsamFields[0], NULL);
-#endif
+    rc = SSMR3GetStructEx(pSSM, &csamInfo, sizeof(csamInfo), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED, &g_aCsamFields[0], NULL);
     AssertRCReturn(rc, rc);
 
@@ -625 +621 @@
 
     /* Restore pgdir bitmap (we'll change the pointers next). */
-#if 0
-    rc = SSMR3GetMem(pSSM, pVM->csam.s.pPDBitmapHC, CSAM_PGDIRBMP_CHUNKS*sizeof(RTHCPTR));
-#else
     rc = SSMR3GetStructEx(pSSM, pVM->csam.s.pPDBitmapHC, sizeof(uint8_t *) * CSAM_PGDIRBMP_CHUNKS,
-                          SSMSTRUCT_FLAGS_MEM_BAND_AID, &g_aCsamPDBitmapArray[0], NULL);
-#endif
+                          SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED, &g_aCsamPDBitmapArray[0], NULL);
     AssertRCReturn(rc, rc);
 
@@ -669 +661 @@
         PCSAMPAGE    pPage;
 
-#if 0
-        rc = SSMR3GetMem(pSSM, &page, sizeof(page));
-#else
         RT_ZERO(page);
-        rc = SSMR3GetStructEx(pSSM, &page, sizeof(page), SSMSTRUCT_FLAGS_MEM_BAND_AID, &g_aCsamPageRecFields[0], NULL);
-#endif
+        rc = SSMR3GetStructEx(pSSM, &page, sizeof(page), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED, &g_aCsamPageRecFields[0], NULL);
         AssertRCReturn(rc, rc);
 

trunk/src/VBox/VMM/VMMR3/PATMSSM.cpp

@@ -733 +733 @@
      */
     RT_ZERO(patmInfo);
-    rc = SSMR3GetStructEx(pSSM, &patmInfo, sizeof(patmInfo), SSMSTRUCT_FLAGS_MEM_BAND_AID, &g_aPatmFields[0], NULL);
+    rc = SSMR3GetStructEx(pSSM, &patmInfo, sizeof(patmInfo), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED, &g_aPatmFields[0], NULL);
     AssertRCReturn(rc, rc);
 
@@ -787 +787 @@
      */
     RT_BZERO(pVM->patm.s.pGCStateHC, sizeof(PATMGCSTATE));
-    rc = SSMR3GetStructEx(pSSM, pVM->patm.s.pGCStateHC, sizeof(PATMGCSTATE), SSMSTRUCT_FLAGS_MEM_BAND_AID, &g_aPatmGCStateFields[0], NULL);
+    rc = SSMR3GetStructEx(pSSM, pVM->patm.s.pGCStateHC, sizeof(PATMGCSTATE), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED, &g_aPatmGCStateFields[0], NULL);
     AssertRCReturn(rc, rc);
 
@@ -805 +805 @@
 
         RT_ZERO(patch);
-        rc = SSMR3GetStructEx(pSSM, &patch, sizeof(patch), SSMSTRUCT_FLAGS_MEM_BAND_AID, &g_aPatmPatchRecFields[0], NULL);
+        rc = SSMR3GetStructEx(pSSM, &patch, sizeof(patch), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED, &g_aPatmPatchRecFields[0], NULL);
         AssertRCReturn(rc, rc);
 
@@ -854 +854 @@
 
             RT_ZERO(rec);
-            rc = SSMR3GetStructEx(pSSM, &rec, sizeof(rec), SSMSTRUCT_FLAGS_MEM_BAND_AID, &g_aPatmRelocRec[0], NULL);
+            rc = SSMR3GetStructEx(pSSM, &rec, sizeof(rec), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED, &g_aPatmRelocRec[0], NULL);
             AssertRCReturn(rc, rc);
 
@@ -902 +902 @@
             {
                 RT_ZERO(rec);
-                rc = SSMR3GetStructEx(pSSM, &rec, sizeof(rec), SSMSTRUCT_FLAGS_MEM_BAND_AID, &g_aPatmRecPatchToGuest[0], NULL);
+                rc = SSMR3GetStructEx(pSSM, &rec, sizeof(rec), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED, &g_aPatmRecPatchToGuest[0], NULL);
                 AssertRCReturn(rc, rc);