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

Timestamp:

Oct 7, 2020 4:53:19 PM (4 years ago)

Author:

vboxsync

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

140779

Message:

VMM/PGMPool: A couple of large page bugfixes (one harmless, the other AMD-V only). bugref:5324 bugref:9841 bugref:9746

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPool.cpp (modified) (1 diff)
• VMMR3/PGMPool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -3364 +3364 @@
 
             const uint64_t  u64 = PGM_PAGE_GET_HCPHYS(pPhysPage) | X86_PDE4M_P | X86_PDE4M_PS;
-            PX86PD          pPD = (PX86PD)PGMPOOL_PAGE_2_PTR(pVM, pPage);
+            PX86PDPAE       pPD = (PX86PDPAE)PGMPOOL_PAGE_2_PTR(pVM, pPage);
 
             if ((pPD->a[iPte].u & (X86_PDE2M_PAE_PG_MASK | X86_PDE4M_P | X86_PDE4M_PS)) == u64)

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

@@ -534 +534 @@
                  */
 #ifdef PGM_WITH_LARGE_PAGES
-                case PGMPOOLKIND_EPT_PD_FOR_PHYS: /* Large pages reference 2 MB of physical memory, so we must clear them. */
+                case PGMPOOLKIND_PAE_PD_PHYS:   /* Large pages reference 2 MB of physical memory, so we must clear them. */
                     if (pPage->cPresent)
                     {
@@ -556 +556 @@
                     goto default_case;
 
-                case PGMPOOLKIND_PAE_PD_PHYS:   /* Large pages reference 2 MB of physical memory, so we must clear them. */
+                case PGMPOOLKIND_EPT_PD_FOR_PHYS: /* Large pages reference 2 MB of physical memory, so we must clear them. */
                     if (pPage->cPresent)
                     {