Changeset 30326 in vbox for trunk/src/VBox/VMM/PGMSavedState.cpp

Timestamp:

Jun 21, 2010 12:35:33 PM (15 years ago)

Author:

vboxsync

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

62891

Message:

PGM: PGMShwModifyPage/PGMShwSetPage -> PGMShwMakePageWritable, PGMShwMakePageReadonly & PGMShwMakePageNotPresent and made the low level worker make the page writable before setting the X86_PTE_RW bit. PGMR3PhysTlbGCPhys2Ptr should make write monitored pages writable (?). PGMDynMapGCPage and PGMDynMapGCPageOff must make the pages writable and take the PGM lock.

File:

• trunk/src/VBox/VMM/PGMSavedState.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -1237 +1237 @@
  * @param   iPage               The page index.
  */
-static void pgmR3StateVerifyCrc32ForPage(void const *pvPage, PPGMRAMRANGE pCur, PPGMLIVESAVERAMPAGE paLSPages, uint32_t iPage)
+static void pgmR3StateVerifyCrc32ForPage(void const *pvPage, PPGMRAMRANGE pCur, PPGMLIVESAVERAMPAGE paLSPages, uint32_t iPage, const  char *pszWhere)
 {
     if (paLSPages[iPage].u32Crc != UINT32_MAX)
     {
         uint32_t u32Crc = RTCrc32(pvPage, PAGE_SIZE);
-        Assert((!PGM_PAGE_IS_ZERO(&pCur->aPages[iPage]) && !PGM_PAGE_IS_BALLOONED(&pCur->aPages[iPage])) || u32Crc == PGM_STATE_CRC32_ZERO_PAGE);
+        Assert(   (   !PGM_PAGE_IS_ZERO(&pCur->aPages[iPage])
+                   && !PGM_PAGE_IS_BALLOONED(&pCur->aPages[iPage]))
+               || u32Crc == PGM_STATE_CRC32_ZERO_PAGE);
         AssertMsg(paLSPages[iPage].u32Crc == u32Crc,
-                  ("%08x != %08x for %RGp %R[pgmpage]\n", paLSPages[iPage].u32Crc, u32Crc,
-                   pCur->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), &pCur->aPages[iPage]));
+                  ("%08x != %08x for %RGp %R[pgmpage] %s\n", paLSPages[iPage].u32Crc, u32Crc,
+                   pCur->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), &pCur->aPages[iPage], pszWhere));
     }
 }
@@ -1259 +1261 @@
  * @param   iPage               The page index.
  */
-static void pgmR3StateVerifyCrc32ForRamPage(PVM pVM, PPGMRAMRANGE pCur, PPGMLIVESAVERAMPAGE paLSPages, uint32_t iPage)
+static void pgmR3StateVerifyCrc32ForRamPage(PVM pVM, PPGMRAMRANGE pCur, PPGMLIVESAVERAMPAGE paLSPages, uint32_t iPage, const char *pszWhere)
 {
     if (paLSPages[iPage].u32Crc != UINT32_MAX)
@@ -1267 +1269 @@
         int rc = pgmPhysGCPhys2CCPtrInternalReadOnly(pVM, &pCur->aPages[iPage], GCPhys, &pvPage);
         if (RT_SUCCESS(rc))
-            pgmR3StateVerifyCrc32ForPage(pvPage, pCur, paLSPages, iPage);
+            pgmR3StateVerifyCrc32ForPage(pvPage, pCur, paLSPages, iPage, pszWhere);
     }
 }
@@ -1370 +1372 @@
                                         pgmR3StateCalcCrc32ForRamPage(pVM, pCur, paLSPages, iPage);
                                     else
-                                        pgmR3StateVerifyCrc32ForRamPage(pVM, pCur, paLSPages, iPage);
+                                        pgmR3StateVerifyCrc32ForRamPage(pVM, pCur, paLSPages, iPage, "scan");
 #endif
                                     paLSPages[iPage].fWriteMonitoredJustNow = 0;
@@ -1568 +1570 @@
 #ifdef PGMLIVESAVERAMPAGE_WITH_CRC32
                             if (PGM_PAGE_GET_TYPE(&pCur->aPages[iPage]) != PGMPAGETYPE_RAM)
-                                pgmR3StateVerifyCrc32ForRamPage(pVM, pCur, paLSPages, iPage);
+                                pgmR3StateVerifyCrc32ForRamPage(pVM, pCur, paLSPages, iPage, "save#1");
 #endif
                             continue;
@@ -1597 +1599 @@
 #ifdef PGMLIVESAVERAMPAGE_WITH_CRC32
                             if (paLSPages)
-                                pgmR3StateVerifyCrc32ForPage(abPage, pCur, paLSPages, iPage);
+                                pgmR3StateVerifyCrc32ForPage(abPage, pCur, paLSPages, iPage, "save#3");
 #endif
                         }
@@ -1619 +1621 @@
 #ifdef PGMLIVESAVERAMPAGE_WITH_CRC32
                         if (paLSPages)
-                            pgmR3StateVerifyCrc32ForRamPage(pVM, pCur, paLSPages, iPage);
+                            pgmR3StateVerifyCrc32ForRamPage(pVM, pCur, paLSPages, iPage, "save#2");
 #endif
                         pgmUnlock(pVM);