Changeset 33780 in vbox for trunk/src

Timestamp:

Nov 4, 2010 3:54:03 PM (14 years ago)

Author:

vboxsync

Message:

During state loading; don't free a zero page if it's part of a large page.

Location:

trunk/src/VBox/VMM

Files:

• PGMPhys.cpp (modified) (1 diff)
• PGMSavedState.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -4118 +4118 @@
         return VMSetError(pVM, VERR_PGM_PHYS_NOT_RAM, RT_SRC_POS, "GCPhys=%RGp type=%d", GCPhys, PGM_PAGE_GET_TYPE(pPage));
     }
+    Assert(PGM_PAGE_GET_PDE_TYPE(pPage) != PGM_PAGE_PDE_TYPE_PDE);
 
     if (    PGM_PAGE_IS_ZERO(pPage)

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -2644 +2644 @@
                             break;
                         AssertLogRelMsgReturn(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED, ("GCPhys=%RGp %R[pgmpage]\n", GCPhys, pPage), VERR_INTERNAL_ERROR_5);
-                        /* Allocated before (prealloc), so free it now. */
-                        rc = pgmPhysFreePage(pVM, pReq, &cPendingPages, pPage, GCPhys);
-                        AssertRC(rc);
+
+                        /* Free it only if it's not part of a previously allocated large page. */
+                        if (PGM_PAGE_GET_PDE_TYPE(pPage) != PGM_PAGE_PDE_TYPE_PDE)
+                        {
+                            /* Allocated before (prealloc), so free it now. */
+                            rc = pgmPhysFreePage(pVM, pReq, &cPendingPages, pPage, GCPhys);
+                            AssertRC(rc);
+                        }
                         break;
                     }