Changeset 24363 in vbox

Timestamp:

Nov 5, 2009 1:52:37 AM (15 years ago)

Author:

vboxsync

Message:

PGMSavedState: Save the RAM config (size + hole).

File:

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

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -48 +48 @@
 *******************************************************************************/
 /** Saved state data unit version. */
-#define PGM_SAVED_STATE_VERSION                 10
+#define PGM_SAVED_STATE_VERSION                 11
+/** Saved state data unit version used during 3.1 development, misses the RAM
+ *  config. */
+#define PGM_SAVED_STATE_VERSION_NO_RAM_CFG      10
 /** Saved state data unit version for 3.0 (pre teleportation). */
 #define PGM_SAVED_STATE_VERSION_3_0_0           9
@@ -1126 +1129 @@
     pgmUnlock(pVM);
 
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Saves the RAM configuration. 
+ *  
+ * @returns VBox status code.
+ * @param   pVM                 The VM handle.
+ * @param   pSSM                The saved state handle.
+ */
+static int pgmR3SaveRamConfig(PVM pVM, PSSMHANDLE pSSM)
+{
+    uint32_t cbRamHole = 0;
+    int rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "RamHoleSize", &cbRamHole, MM_RAM_HOLE_SIZE_DEFAULT);
+    AssertRCReturn(rc, rc);
+
+    uint64_t cbRam     = 0;
+    rc = CFGMR3QueryU64Def(CFGMR3GetRoot(pVM), "RamSize", &cbRam, 0);
+    AssertRCReturn(rc, rc);
+
+    SSMR3PutU32(pSSM, cbRamHole);
+    return SSMR3PutU64(pSSM, cbRam);
+}
+
+
+/**
+ * Loads and verifies the RAM configuration.
+ *  
+ * @returns VBox status code.
+ * @param   pVM                 The VM handle.
+ * @param   pSSM                The saved state handle.
+ */
+static int pgmR3LoadRamConfig(PVM pVM, PSSMHANDLE pSSM)
+{
+    uint32_t cbRamHoleCfg = 0;
+    int rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "RamHoleSize", &cbRamHoleCfg, MM_RAM_HOLE_SIZE_DEFAULT);
+    AssertRCReturn(rc, rc);
+
+    uint64_t cbRamCfg     = 0;
+    rc = CFGMR3QueryU64Def(CFGMR3GetRoot(pVM), "RamSize", &cbRamCfg, 0);
+    AssertRCReturn(rc, rc);
+
+    uint32_t cbRamHoleSaved;
+    SSMR3GetU32(pSSM, &cbRamHoleSaved);
+
+    uint64_t cbRamSaved;
+    rc = SSMR3GetU64(pSSM, &cbRamSaved);
+    AssertRCReturn(rc, rc);
+
+    if (   cbRamHoleCfg != cbRamHoleSaved
+        || cbRamCfg     != cbRamSaved)
+        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;
 }
@@ -1656 +1713 @@
     if (uPass == 0)
     {
+        rc = pgmR3SaveRamConfig(pVM, pSSM);
+        if (RT_FAILURE(rc))
+            return rc;
         rc = pgmR3SaveRomRanges(pVM, pSSM);
         if (RT_FAILURE(rc))
@@ -1847 +1907 @@
         else
         {
-            rc = pgmR3SaveRomRanges(pVM, pSSM);
+            rc = pgmR3SaveRamConfig(pVM, pSSM);
+            if (RT_SUCCESS(rc))
+                rc = pgmR3SaveRomRanges(pVM, pSSM);
             if (RT_SUCCESS(rc))
                 rc = pgmR3SaveMmio2Ranges(pVM, pSSM);
@@ -2715 +2777 @@
                 break;
         if (!pMapping)
-            return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Couldn't find mapping: cPTs=%x szDesc=%s (GCPtr=%RGv)"),
+            return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Couldn't find mapping: cPTs=%#x szDesc=%s (GCPtr=%RGv)"),
                                     cPTs, szDesc, GCPtr);
 
@@ -2735 +2797 @@
         if (!pVM->pgm.s.LiveSave.fActive)
         {
+            if (uVersion > PGM_SAVED_STATE_VERSION_NO_RAM_CFG)
+            {
+                rc = pgmR3LoadRamConfig(pVM, pSSM);
+                if (RT_FAILURE(rc))
+                    return rc;
+            }
             rc = pgmR3LoadRomRanges(pVM, pSSM);
             if (RT_FAILURE(rc))
@@ -2767 +2835 @@
      */
     if (   (   uPass != SSM_PASS_FINAL
-            && uVersion != PGM_SAVED_STATE_VERSION)
+            && uVersion != PGM_SAVED_STATE_VERSION
+            && uVersion != PGM_SAVED_STATE_VERSION_NO_RAM_CFG)
         || (   uVersion != PGM_SAVED_STATE_VERSION
+            && uVersion != PGM_SAVED_STATE_VERSION_NO_RAM_CFG
             && uVersion != PGM_SAVED_STATE_VERSION_3_0_0
             && uVersion != PGM_SAVED_STATE_VERSION_2_2_2
@@ -2791 +2861 @@
         {
             pVM->pgm.s.LiveSave.fActive = true;
-            rc = pgmR3LoadRomRanges(pVM, pSSM);
+            if (uVersion > PGM_SAVED_STATE_VERSION_NO_RAM_CFG)
+                rc = pgmR3LoadRamConfig(pVM, pSSM);
+            else
+                rc = VINF_SUCCESS;
+            if (RT_SUCCESS(rc))
+                rc = pgmR3LoadRomRanges(pVM, pSSM);
             if (RT_SUCCESS(rc))
                 rc = pgmR3LoadMmio2Ranges(pVM, pSSM);