Changeset 18046 in vbox

Timestamp:

Mar 17, 2009 10:30:35 PM (16 years ago)

Author:

vboxsync

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

44651

Message:

PGM,MM: saved state bugfixes for VBOX_WITH_NEW_PHYS_CODE.

Location:

trunk/src/VBox/VMM

Files:

• MM.cpp (modified) (2 diffs)
• PGM.cpp (modified) (11 diffs)
• PGMInternal.h (modified) (1 diff)
• PGMPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/MM.cpp

@@ -605 +605 @@
     if (RT_FAILURE(rc))
         return rc;
-    if (cPages != pVM->mm.s.cBasePages)
-    {
-        LogRel(("mmR3Load: Memory configuration has changed. cPages=%#RX64 saved=%#RX64\n", pVM->mm.s.cBasePages, cPages));
-        return VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH;
-    }
+#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 */
@@ -622 +626 @@
     if (RT_FAILURE(rc))
         return rc;
-    if (cb != pVM->mm.s.cbRamBase)
-    {
-        LogRel(("mmR3Load: Memory configuration has changed. cbRamBase=%#RX64 save=%#RX64\n", pVM->mm.s.cbRamBase, cb));
-        return VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH;
-    }
+    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);
 
     /* (PGM restores the physical memory.) */

trunk/src/VBox/VMM/PGM.cpp

@@ -2338 +2338 @@
             }
             else
+            {    
+                SSMR3PutU8(pSSM, uType);
                 rc = pgmR3SavePage(pVM, pSSM, pPage, GCPhysPage, pRam);
+            }
             if (RT_FAILURE(rc))
                 break;
@@ -2447 +2450 @@
      * Match up the type, dealing with MMIO2 aliases (dropped).
      */
-    if (    PGM_PAGE_GET_TYPE(pPage) != uType
-        &&  uType != PGMPAGETYPE_INVALID)
-    {
-        AssertLogRelMsgRCReturn(rc, ("pPage=%R[pgmpage] GCPhys=%#x %s\n", pPage, GCPhys, pRam->pszDesc), rc);
-        return VERR_SSM_UNEXPECTED_DATA;
-    }
+    AssertLogRelMsgReturn(   PGM_PAGE_GET_TYPE(pPage) == uType
+                          || uType == PGMPAGETYPE_INVALID,
+                          ("pPage=%R[pgmpage] GCPhys=%#x %s\n", pPage, GCPhys, pRam->pszDesc), 
+                          VERR_SSM_UNEXPECTED_DATA);
 
     /*
@@ -2481 +2482 @@
     uint8_t         uState;
     int rc = SSMR3GetU8(pSSM, &uState);
-    AssertLogRelMsgRCReturn(rc, ("pPage=%R[pgmpage] GCPhys=%#x %s\n", pPage, GCPhys, pRam->pszDesc), rc);
+    AssertLogRelMsgRCReturn(rc, ("pPage=%R[pgmpage] GCPhys=%#x %s rc=%Rrc\n", pPage, GCPhys, pRam->pszDesc, rc), rc);
     if (uState == 0 /* zero */)
         rc = pgmR3LoadPageZero(pVM, uType, pPage, GCPhys, pRam);
@@ -2488 +2489 @@
     else
         rc = VERR_INTERNAL_ERROR;
-    AssertLogRelMsgRCReturn(rc, ("pPage=%R[pgmpage] uState=%d uType=%d GCPhys=%#x %s\n",
+    AssertLogRelMsgRCReturn(rc, ("pPage=%R[pgmpage] uState=%d uType=%d GCPhys=%RGp %s rc=%Rrc\n",
                                  pPage, uState, uType, GCPhys, pRam->pszDesc),
                             rc);
@@ -2579 +2580 @@
         if (RT_FAILURE(rc))
             return rc;
-        if (cbRamSize != pPGM->cbRamSize)
-            return VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH;
+        AssertLogRelMsgReturn(cbRamSize == pPGM->cbRamSize, ("%#x != %#x\n", cbRamSize, pPGM->cbRamSize), 
+                              VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH);
         SSMR3GetGCPhys(pSSM,    &pPGM->GCPhysA20Mask);
 
@@ -2720 +2721 @@
             &&  (   u32Version != PGM_SAVED_STATE_VERSION_OLD_PHYS_CODE
                  || GCPhys     != UINT32_C(0xfff80000)
-                 || GCPhysLast != UINT32_C(0xfff80000)
+                 || GCPhysLast != UINT32_C(0xffffffff)
                  || pRam->GCPhysLast != GCPhysLast
                  || pRam->GCPhys     <  GCPhys
@@ -2782 +2783 @@
              * Old format.
              */
-            AssertLogRelReturn(pVM->pgm.s.fRamPreAlloc, VERR_NOT_SUPPORTED); /* can't be detected. */
+            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.
@@ -2796 +2797 @@
 
             /* Load the bits */
-            if (!fHaveBits)
+            if (    !fHaveBits 
+                &&  GCPhysLast < UINT32_C(0xe0000000))
             {
                 /*
                  * Dynamic chunks.
                  */
-                const uint32_t cPagesInChunk = (1*1024*1024) >> PAGE_SHIFT;;
+                const uint32_t cPagesInChunk = (1*1024*1024) >> PAGE_SHIFT;
                 AssertLogRelMsgReturn(cPages % cPagesInChunk == 0,
                                       ("cPages=%#x cPagesInChunk=%#x\n", cPages, cPagesInChunk, pRam->GCPhys, pRam->pszDesc),
@@ -2811 +2813 @@
                     rc = SSMR3GetU8(pSSM, &fPresent);
                     AssertLogRelMsgRCReturn(rc, ("rc=%Rrc iPage=%#x GCPhys=%#x %s\n", rc, iPage, pRam->GCPhys, pRam->pszDesc), rc);
-                    AssertLogRelMsgReturn(fPresent == true || fPresent == false,
+                    AssertLogRelMsgReturn(fPresent == (uint8_t)true || fPresent == (uint8_t)false,
                                           ("fPresent=%#x iPage=%#x GCPhys=%#x %s\n", fPresent, iPage, pRam->GCPhys, pRam->pszDesc),
                                           VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
 
-                    for (i = 0; i < cPagesInChunk; i++, iPage++)
+                    for (uint32_t iChunkPage = 0; iChunkPage < cPagesInChunk; iChunkPage++, iPage++)
                     {
                         RTGCPHYS const  GCPhysPage = ((RTGCPHYS)iPage << PAGE_SHIFT) + pRam->GCPhys;
                         PPGMPAGE        pPage      = &pRam->aPages[iPage];
                         if (fPresent)
-                            rc = pgmR3LoadPageBits(pVM, pSSM, PGMPAGETYPE_INVALID, pPage, GCPhysPage, pRam);
+                        {
+                            if (PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO)
+                                rc = pgmR3LoadPageToDevNull(pSSM);
+                            else
+                                rc = pgmR3LoadPageBits(pVM, pSSM, PGMPAGETYPE_INVALID, pPage, GCPhysPage, pRam);
+                        }
                         else
                             rc = pgmR3LoadPageZero(pVM, PGMPAGETYPE_INVALID, pPage, GCPhysPage, pRam);
@@ -2832 +2839 @@
                  * MMIO2.
                  */
-                AssertLogRelMsgReturn((fFlags & 0x03) == RT_BIT(3) /*MM_RAM_FLAGS_MMIO2*/,
+                AssertLogRelMsgReturn((fFlags & 0x0f) == RT_BIT(3) /*MM_RAM_FLAGS_MMIO2*/,
                                       ("fFlags=%#x GCPhys=%#x %s\n", fFlags, pRam->GCPhys, pRam->pszDesc),
                                       VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
@@ -2841 +2848 @@
                 rc = SSMR3GetMem(pSSM, pRam->pvR3, pRam->cb);
                 AssertLogRelMsgRCReturn(rc, ("GCPhys=%#x %s\n", pRam->GCPhys, pRam->pszDesc), rc);
+            }
+            else if (GCPhysLast < UINT32_C(0xfff80000))
+            {
+                /*
+                 * PCI MMIO, no pages saved.
+                 */
             }
             else

trunk/src/VBox/VMM/PGMInternal.h

@@ -2486 +2486 @@
     RTGCPHYS                        GCPhysA20Mask;
     /** A20 gate state - boolean! */
-    RTUINT                          fA20Enabled;
+    bool                            fA20Enabled;
 
     /** What needs syncing (PGM_SYNC_*).

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -356 +356 @@
 static void pgmR3PhysLinkRamRange(PVM pVM, PPGMRAMRANGE pNew, PPGMRAMRANGE pPrev)
 {
+    AssertMsg(pNew->pszDesc, ("%RGp-%RGp\n", pNew->GCPhys, pNew->GCPhysLast));
+
     pgmLock(pVM);