Changeset 18607 in vbox

Timestamp:

Apr 1, 2009 4:25:17 PM (16 years ago)

Author:

vboxsync

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

45513

Message:

mmR3Load: Ignore the saved cBasePages.

File:

• trunk/src/VBox/VMM/MM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/MM.cpp

@@ -594 +594 @@
     RTUINT cb1;
 
-    /* cBasePages */
+    /* cBasePages (ignored) */
     uint64_t cPages;
-    if (u32Version != 1)
+    if (u32Version >= 2)
         rc = SSMR3GetU64(pSSM, &cPages);
     else
@@ -605 +605 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifdef VBOX_WITH_NEW_PHYS_CODE
-    AssertLogRelMsgReturn(cPages <= pVM->mm.s.cBasePages, /* shadowed rom is counted twice, exact match here isn't really important. */
-                          ("Memory configuration has changed. cPages=%#RX64 saved=%#RX64\n", pVM->mm.s.cBasePages, cPages),
-                          VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH);
-#else
-    AssertLogRelMsgReturn(cPages == pVM->mm.s.cBasePages,
-                          ("Memory configuration has changed. cPages=%#RX64 saved=%#RX64\n", pVM->mm.s.cBasePages, cPages),
-                          VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH);
-#endif
 
     /* cbRamBase */
@@ -626 +617 @@
     if (RT_FAILURE(rc))
         return rc;
-    AssertLogRelMsgReturn(cb == pVM->mm.s.cbRamBase, 
+    AssertLogRelMsgReturn(cb == pVM->mm.s.cbRamBase,
                           ("Memory configuration has changed. cbRamBase=%#RX64 save=%#RX64\n", pVM->mm.s.cbRamBase, cb),
                           VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH);