Changeset 32295 in vbox for trunk

Timestamp:

Sep 7, 2010 3:48:34 PM (14 years ago)

Author:

vboxsync

Message:

Deal with MMIO2 pages as well (FTM)

Location:

trunk/src/VBox/VMM

Files:

• FTM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/FTM.cpp

@@ -917 +917 @@
             {
                 /* Timeout; prepare to fallover. */
-                LogRel(("FTM: TIMEOUT (%RX64 vs %RX64): activate standby VM!\n", u64TimeNow, pVM->ftm.s.standby.u64LastHeartbeat + pVM->ftm.s.uInterval * 2));
+                LogRel(("FTSync: TIMEOUT (%RX64 vs %RX64 ms): activate standby VM!\n", u64TimeNow, pVM->ftm.s.standby.u64LastHeartbeat + pVM->ftm.s.uInterval * 2));
 
                 pVM->ftm.s.fActivateStandby = true;

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -989 +989 @@
             for (unsigned iPage = 0; iPage < cPages; iPage++)
             {
-                PPGMPAGE pPage = &pRam->aPages[iPage];
-                if (RT_LIKELY(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM))
+                PPGMPAGE    pPage = &pRam->aPages[iPage];
+                PGMPAGETYPE enmPageType = (PGMPAGETYPE)PGM_PAGE_GET_TYPE(pPage);
+
+                if (    RT_LIKELY(enmPageType == PGMPAGETYPE_RAM)
+                    ||  enmPageType == PGMPAGETYPE_MMIO2)
                 {
                     /*
@@ -1069 +1072 @@
             for (unsigned iPage = 0; iPage < cPages; iPage++)
             {
-                PPGMPAGE pPage = &pRam->aPages[iPage];
-                if (RT_LIKELY(PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_RAM))
+                PPGMPAGE    pPage = &pRam->aPages[iPage];
+                PGMPAGETYPE enmPageType = (PGMPAGETYPE)PGM_PAGE_GET_TYPE(pPage);
+
+                if (    RT_LIKELY(enmPageType == PGMPAGETYPE_RAM)
+                    ||  enmPageType == PGMPAGETYPE_MMIO2)
                 {
                     /*