Changeset 36042 in vbox for trunk/src/VBox

Timestamp:

Feb 21, 2011 4:51:08 PM (14 years ago)

Author:

vboxsync

Message:

PGMSavedState.cpp: Must change ballooned pages to zero pages when processing PGM_STATE_REC_RAM_ZERO.

File:

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

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

@@ -85 +85 @@
 /** ROM protection (8-bit). */
 #define PGM_STATE_REC_ROM_PROT          UINT8_C(0x07)
-/** Ballooned page. */
+/** Ballooned page. No data. */
 #define PGM_STATE_REC_RAM_BALLOONED     UINT8_C(0x08)
 /** The last record type. */
@@ -514 +514 @@
                     RTGCPHYS    GCPhys  = pRom->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT);
                     PPGMPAGE    pPage   = PGMROMPROT_IS_ROM(enmProt) ? &pRomPage->Shadow : pgmPhysGetPage(&pVM->pgm.s, GCPhys);
-                    bool        fZero   = PGM_PAGE_IS_ZERO(pPage) || PGM_PAGE_IS_BALLOONED(pPage);  /* Do we ever balloon shadow ROM pages!? */
+                    bool        fZero   = PGM_PAGE_IS_ZERO(pPage) || PGM_PAGE_IS_BALLOONED(pPage); Assert(!PGM_PAGE_IS_BALLOONED(pPage)); /* Shouldn't be ballooned. */
                     int         rc      = VINF_SUCCESS;
                     if (!fZero)
@@ -1364 +1364 @@
                                 }
 
-                                pgmPhysPageWriteMonitor(pVM, &pCur->aPages[iPage], 
+                                pgmPhysPageWriteMonitor(pVM, &pCur->aPages[iPage],
                                                         pCur->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT));
                                 paLSPages[iPage].fWriteMonitored        = 1;
@@ -1672 +1672 @@
                     {
                         /*
-                         * Dirty zero page.
+                         * Dirty zero or ballooned page.
                          */
 #ifdef PGMLIVESAVERAMPAGE_WITH_CRC32
@@ -2566 +2566 @@
  * @param   pVM                 The VM handle.
  * @param   pSSM                The SSM handle.
+ * @param   uVersion            The PGM saved state unit version.
  * @param   uPass               The pass number.
  *
@@ -2571 +2572 @@
  *          added...
  */
-static int pgmR3LoadMemory(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass)
+static int pgmR3LoadMemory(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
     /*
@@ -2650 +2651 @@
                     case PGM_STATE_REC_RAM_ZERO:
                     {
-                        if (    PGM_PAGE_IS_ZERO(pPage)
-                            ||  PGM_PAGE_IS_BALLOONED(pPage))
+                        if (PGM_PAGE_IS_ZERO(pPage))
                             break;
+
+                        /* Ballooned pages must be unmarked (live snapshot and
+                           teleportation scenarios). */
+                        if (PGM_PAGE_IS_BALLOONED(pPage))
+                        {
+                            Assert(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM);
+                            if (uVersion == PGM_SAVED_STATE_VERSION_BALLOON_BROKEN)
+                                break;
+                            PGM_PAGE_SET_STATE(pPage, PGM_PAGE_STATE_ZERO);
+                            break;
+                        }
+
                         AssertLogRelMsgReturn(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED, ("GCPhys=%RGp %R[pgmpage]\n", GCPhys, pPage), VERR_INTERNAL_ERROR_5);
 
@@ -2679 +2691 @@
                     case PGM_STATE_REC_RAM_BALLOONED:
                     {
+                        Assert(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM);
                         if (PGM_PAGE_IS_BALLOONED(pPage))
                             break;
 
-                        /*
-                         * We don't map ballooned pages in our shadow page tables, let's just free it if allocated and mark as ballooned.
-                         * See #5515.
-                         */
+                        /* We don't map ballooned pages in our shadow page tables, let's
+                           just free it if allocated and mark as ballooned.  See #5515. */
                         if (PGM_PAGE_IS_ALLOCATED(pPage))
                         {
@@ -3030 +3041 @@
         }
 
-        rc = pgmR3LoadMemory(pVM, pSSM, SSM_PASS_FINAL);
+        rc = pgmR3LoadMemory(pVM, pSSM, uVersion, SSM_PASS_FINAL);
     }
     else
@@ -3090 +3101 @@
         pgmLock(pVM);
         if (uPass != 0)
-            rc = pgmR3LoadMemory(pVM, pSSM, uPass);
+            rc = pgmR3LoadMemory(pVM, pSSM, uVersion, uPass);
         else
         {
@@ -3103 +3114 @@
                 rc = pgmR3LoadMmio2Ranges(pVM, pSSM);
             if (RT_SUCCESS(rc))
-                rc = pgmR3LoadMemory(pVM, pSSM, uPass);
+                rc = pgmR3LoadMemory(pVM, pSSM, uVersion, uPass);
         }
         pgmUnlock(pVM);