Changeset 86462 in vbox for trunk

Timestamp:

Oct 6, 2020 4:43:10 PM (4 years ago)

Author:

vboxsync

Message:

VMM/PGM: Don't check for, or even define, PGM_PLXFLAGS_MAPPING when PGM_WITHOUT_MAPPINGS is active (the default now).

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)
• include/PGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -1074 +1074 @@
 #  endif
     {
+#ifndef PGM_WITHOUT_MAPPINGS
         Assert(!pPdptDst || !(pPdptDst->a[iPdpt].u & PGM_PLXFLAGS_MAPPING));
+#endif
         STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,InvalidatePageSkipped));
         PGM_INVL_PG(pVCpu, GCPtrPage);

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

@@ -4561 +4561 @@
         Assert((pShwPDPT->a[i].u & (X86_PDPE_PAE_MBZ_MASK | UINT64_C(0x7ff0000000000200))) == 0);
         if (    pShwPDPT->a[i].n.u1Present
+#ifndef PGM_WITHOUT_MAPPINGS
             &&  !(pShwPDPT->a[i].u & PGM_PLXFLAGS_MAPPING)
+#endif
            )
         {

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -170 +170 @@
  * Never free such an entry. */
 #define PGM_PLXFLAGS_PERMANENT          RT_BIT_64(10)
+#ifndef PGM_WITHOUT_MAPPINGS
 /** Mapping (hypervisor allocated pagetable). */
 #define PGM_PLXFLAGS_MAPPING            RT_BIT_64(11)
+#endif
 /** @} */