Changeset 24481 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 9, 2009 9:45:54 AM (15 years ago)

Author:

vboxsync

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

54565

Message:

PGMSavedState.cpp: /RamPreAlloc=true shouldn't make any difference for the saved state layout in 2.1.x and earlier, so drop the assert+return.

File:

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

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -1134 +1134 @@
 
 /**
- * Saves the RAM configuration. 
- *  
+ * Saves the RAM configuration.
+ *
  * @returns VBox status code.
  * @param   pVM                 The VM handle.
@@ -1157 +1157 @@
 /**
  * Loads and verifies the RAM configuration.
- *  
+ *
  * @returns VBox status code.
  * @param   pVM                 The VM handle.
@@ -1181 +1181 @@
     if (   cbRamHoleCfg != cbRamHoleSaved
         || cbRamCfg     != cbRamSaved)
-        return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Ram config mismatch: saved=%RX64/%RX32 config=%RX64/%RX32 (RAM/Hole)"), 
+        return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Ram config mismatch: saved=%RX64/%RX32 config=%RX64/%RX32 (RAM/Hole)"),
                                 cbRamSaved, cbRamHoleSaved, cbRamCfg, cbRamHoleCfg);
     return VINF_SUCCESS;
@@ -2267 +2267 @@
              * Old format.
              */
-            AssertLogRelReturn(!pVM->pgm.s.fRamPreAlloc, VERR_NOT_SUPPORTED); /* can't be detected. */
 
             /* Of the page flags, pick up MMIO2 and ROM/RESERVED for the !fHaveBits case.