Changeset 18861 in vbox

Timestamp:

Apr 10, 2009 9:21:46 AM (16 years ago)

Author:

vboxsync

Message:

PGM: Increased saved state version and deal with the MMIO description strings (ignore the strings, unless current saved state).

File:

• trunk/src/VBox/VMM/PGM.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -609 +609 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/** Saved state data unit version. */
-#define PGM_SAVED_STATE_VERSION                 7
-/** Saved state data unit version. */
+/** Saved state data unit version for 2.2.2 and later. */
+#define PGM_SAVED_STATE_VERSION                 8
+/** Saved state data unit version for 2.2.0. */
+#define PGM_SAVED_STATE_VERSION_RR_DESC         7
+/** Saved state data unit version 2.1.x and earlier. */
 #define PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE   6
 
@@ -2506 +2508 @@
      * Load basic data (required / unaffected by relocation).
      */
-    if (u32Version >= PGM_SAVED_STATE_VERSION)
+    if (u32Version >= PGM_SAVED_STATE_VERSION_RR_DESC)
     {
         rc = SSMR3GetStruct(pSSM, pPGM, &s_aPGMFields[0]);
@@ -2629 +2631 @@
             return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
         }
-        char szDesc[256];
+        size_t  cchDesc = 0;
+        char    szDesc[256];
         szDesc[0] = '\0';
-        if (u32Version >= PGM_SAVED_STATE_VERSION)
+        if (u32Version >= PGM_SAVED_STATE_VERSION_RR_DESC)
         {
             rc = SSMR3GetStrZ(pSSM, szDesc, sizeof(szDesc));
             if (RT_FAILURE(rc))
                 return rc;
+            /* Since we've modified the description strings in r45878, only compare
+               them if the saved state is more recent. */
+            if (u32Version != PGM_SAVED_STATE_VERSION_RR_DESC)
+                cchDesc = strlen(szDesc);
         }
 
@@ -2648 +2655 @@
                  || GCPhysLast != pRam->GCPhysLast
                  || cb         != pRam->cb
-                 ||  (szDesc[0] && strcmp(szDesc, pRam->pszDesc)) )
+                 ||  (   cchDesc
+                      && strcmp(szDesc, pRam->pszDesc)) )
                 /* Hack for PDMDevHlpPhysReserve(pDevIns, 0xfff80000, 0x80000, "High ROM Region"); */
             &&  (   u32Version != PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE
@@ -2675 +2683 @@
 
         uint32_t cPages = (GCPhysLast - GCPhys + 1) >> PAGE_SHIFT;
-        if (u32Version >= PGM_SAVED_STATE_VERSION)
+        if (u32Version >= PGM_SAVED_STATE_VERSION_RR_DESC)
         {
             /*
@@ -2831 +2839 @@
      */
     if (    u32Version != PGM_SAVED_STATE_VERSION
+        &&  u32Version != PGM_SAVED_STATE_VERSION_RR_DESC
         &&  u32Version != PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE)
     {