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

Timestamp:

Nov 21, 2019 11:56:21 PM (5 years ago)

Author:

vboxsync

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

134898

Message:

PGM/pgmR3PhysMMIOExLink: Corrected apMmio2RangesR3/R0 updating and an assertion. bugref:9218

File:

• trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (3 diffs)

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

@@ -2888 +2888 @@
      * Link it into the list (order doesn't matter, so insert it at the head).
      *
-     * Note! The range we're link may consist of multiple chunks, so we have to
-     *       find the last one.
+     * Note! The range we're linking may consist of multiple chunks, so we
+     *       have to find the last one.
      */
     PPGMREGMMIO2RANGE pLast = pNew;
@@ -2901 +2901 @@
         Assert(pLast->pNextR3->iRegion   == pNew->iRegion);
         Assert((pLast->pNextR3->fFlags & PGMREGMMIO2RANGE_F_MMIO2) == (pNew->fFlags & PGMREGMMIO2RANGE_F_MMIO2));
-        Assert(pLast->pNextR3->idMmio2   == (pLast->fFlags & PGMREGMMIO2RANGE_F_MMIO2 ? pNew->idMmio2 + 1 : UINT8_MAX));
+        Assert(pLast->pNextR3->idMmio2   == (pLast->fFlags & PGMREGMMIO2RANGE_F_MMIO2 ? pLast->idMmio2 + 1 : UINT8_MAX));
     }
 
@@ -2924 +2924 @@
                 break;
             pNew = pNew->pNextR3;
+            idMmio2++;
         }
     }