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

Timestamp:

Aug 2, 2009 5:20:20 PM (16 years ago)

Author:

vboxsync

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

50595

Message:

PGM: Fixed restore bug where pgmR3LoadLocked left a 32-bit ~0U behind.

File:

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

trunk/src/VBox/VMM/PGM.cpp

@@ -2659 +2659 @@
 static int pgmR3LoadLocked(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Version)
 {
+    PPGM        pPGM = &pVM->pgm.s;
     int         rc;
-    PPGM        pPGM = &pVM->pgm.s;
     uint32_t    u32Sep;
 
@@ -2671 +2671 @@
         AssertLogRelRCReturn(rc, rc);
 
-        for (unsigned i=0;i<pVM->cCPUs;i++)
+        for (VMCPUID i = 0; i < pVM->cCPUs; i++)
         {
-            PVMCPU pVCpu = &pVM->aCpus[i];
-
-            rc = SSMR3GetStruct(pSSM, &pVCpu->pgm.s, &s_aPGMCpuFields[0]);
+            rc = SSMR3GetStruct(pSSM, &pVM->aCpus[i].pgm.s, &s_aPGMCpuFields[0]);
             AssertLogRelRCReturn(rc, rc);
         }
     }
-    else
-    if (u32Version >= PGM_SAVED_STATE_VERSION_RR_DESC)
-    {
+    else if (u32Version >= PGM_SAVED_STATE_VERSION_RR_DESC)
+    {
+        AssertRelease(pVM->cCPUs == 1);
+
         PGMOLD pgmOld;
-
-        AssertRelease(pVM->cCPUs == 1);
-
         rc = SSMR3GetStruct(pSSM, &pgmOld, &s_aPGMFields_Old[0]);
         AssertLogRelRCReturn(rc, rc);
@@ -2785 +2781 @@
      */
     i = 0;
-    for (PPGMRAMRANGE pRam = pPGM->pRamRangesR3; pRam; pRam = pRam->pNextR3, i++)
-    {
-        /** @todo MMIO ranges may move (PCI reconfig), we currently assume they don't. */
-
+    for (PPGMRAMRANGE pRam = pPGM->pRamRangesR3; ; pRam = pRam->pNextR3, i++)
+    {
         /* Check the seqence number / separator. */
         rc = SSMR3GetU32(pSSM, &u32Sep);
@@ -2800 +2794 @@
             return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
         }
+        AssertLogRelReturn(pRam, VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
 
         /* Get the range details. */