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

Timestamp:

May 22, 2013 12:59:59 PM (12 years ago)

Author:

vboxsync

Message:

Fixed bug in previous memory scan fix (MMIO2 aliases for MMIO).

File:

• trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp

@@ -659 +659 @@
             {
                 PPGMPAGE pPage = &pRam->aPages[iPage];
-                if (    (   !PGM_PAGE_IS_ZERO(pPage)
-                         || fAllZero)
-                        &&  !PGM_PAGE_IS_MMIO(pPage)
-                        &&  !PGM_PAGE_IS_BALLOONED(pPage)
-                        &&  PGM_PAGE_GET_STATE(pPage) != PGMPAGETYPE_MMIO2_ALIAS_MMIO)
+                if (   (   !PGM_PAGE_IS_ZERO(pPage)
+                        || fAllZero)
+                    && !PGM_PAGE_IS_MMIO(pPage)
+                    && PGM_PAGE_GET_STATE(pPage) != PGMPAGETYPE_MMIO2_ALIAS_MMIO
+                    && !PGM_PAGE_IS_BALLOONED(pPage))
                 {
                     void const     *pvPage;
@@ -804 +804 @@
         {
             PPGMPAGE pPage = pgmPhysGetPage(pVM, Walk.u.Core.GCPhys);
-            if (    pPage
-                &&  (   !PGM_PAGE_IS_ZERO(pPage)
-                     || fAllZero)
-                &&  !PGM_PAGE_IS_MMIO(pPage)
-                &&  !PGM_PAGE_IS_BALLOONED(pPage)
-                &&  PGM_PAGE_GET_STATE(pPage) != PGMPAGETYPE_MMIO2_ALIAS_MMIO)
+            if (   pPage
+                && (   !PGM_PAGE_IS_ZERO(pPage)
+                    || fAllZero)
+                && !PGM_PAGE_IS_MMIO(pPage)
+                && PGM_PAGE_GET_TYPE(pPage) != PGMPAGETYPE_MMIO2_ALIAS_MMIO
+                && !PGM_PAGE_IS_BALLOONED(pPage))
             {
                 void const *pvPage;