Changeset 22137 in vbox for trunk/src

Timestamp:

Aug 10, 2009 2:05:44 PM (15 years ago)

Author:

vboxsync

Message:

PGM: Relocate pSelfRC of the MMIO2 ram ranges since unmapped ones will otherwise not be updated. Fixes #4195.

File:

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

trunk/src/VBox/VMM/PGM.cpp

@@ -680 +680 @@
     { "pgmerror",      0, 1,        &g_aPgmErrorArgs[0],      1,            NULL,               0,          pgmR3CmdError,      "",                     "Enables inject runtime of errors into parts of PGM." },
     { "pgmerroroff",   0, 1,        &g_aPgmErrorArgs[0],      1,            NULL,               0,          pgmR3CmdError,      "",                     "Disables inject runtime errors into parts of PGM." },
-#ifdef VBOX_STRICT                                            
+#ifdef VBOX_STRICT
     { "pgmassertcr3",  0, 0,        NULL,                     0,            NULL,               0,          pgmR3CmdAssertCR3,  "",                     "Check the shadow CR3 mapping." },
-#endif                                                        
+#endif
     { "pgmsyncalways", 0, 0,        NULL,                     0,            NULL,               0,          pgmR3CmdSyncAlways, "",                     "Toggle permanent CR3 syncing." },
     { "pgmphystofile", 1, 2,        &g_aPgmPhysToFileArgs[0], 2,            NULL,               0,          pgmR3CmdPhysToFile, "",                     "Save the physical memory to file." },
@@ -2034 +2034 @@
         pgmR3PhysRelinkRamRanges(pVM);
     }
+
+    /*
+     * Update the pSelfRC pointer of the MMIO2 ram ranges since they might not
+     * be mapped and thus not included in the above exercise.
+     */
+    for (PPGMMMIO2RANGE pCur = pVM->pgm.s.pMmio2RangesR3; pCur; pCur = pCur->pNextR3)
+        if (!(pCur->RamRange.fFlags & PGM_RAM_RANGE_FLAGS_FLOATING))
+            pCur->RamRange.pSelfRC = MMHyperCCToRC(pVM, &pCur->RamRange);
 
     /*
@@ -5020 +5028 @@
 
     pgmLock(pVM);
-    for (PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesR3; 
-          pRam && pRam->GCPhys < GCPhysEnd && RT_SUCCESS(rc); 
+    for (PPGMRAMRANGE pRam = pVM->pgm.s.pRamRangesR3;
+          pRam && pRam->GCPhys < GCPhysEnd && RT_SUCCESS(rc);
           pRam = pRam->pNextR3)
     {
@@ -5040 +5048 @@
             {
                 if (fIncZeroPgs)
-                {    
+                {
                     rc = RTFileWrite(hFile, abZeroPg, PAGE_SIZE, NULL);
                     if (RT_FAILURE(rc))
@@ -5075 +5083 @@
                     case PGMPAGETYPE_MMIO:
                         if (fIncZeroPgs)
-                        {    
+                        {
                             rc = RTFileWrite(hFile, abZeroPg, PAGE_SIZE, NULL);
                             if (RT_FAILURE(rc))