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

Timestamp:

Aug 16, 2012 7:11:15 AM (13 years ago)

Author:

vboxsync

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

80093

Message:

VMM: Respect RamPreAlloc while restoring saved state.

File:

• trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp (modified) (1 diff)

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

@@ -2679 +2679 @@
                         AssertLogRelMsgReturn(PGM_PAGE_GET_STATE(pPage) == PGM_PAGE_STATE_ALLOCATED, ("GCPhys=%RGp %R[pgmpage]\n", GCPhys, pPage), VERR_PGM_UNEXPECTED_PAGE_STATE);
 
-                        /* If this is a ROM page, we must clear it and not try
-                           free it... */
+                        /*
+                         * If this is a ROM page, we must clear it and not try to free it.
+                         * If the VM is using RamPreAlloc, don't free the page either (see @bugref{6318}).
+                         */
                         if (   PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_ROM
-                            || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_ROM_SHADOW)
+                            || PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_ROM_SHADOW
+                            || pVM->pgm.s.fRamPreAlloc)
                         {
                             PGMPAGEMAPLOCK PgMpLck;