Changeset 26841 in vbox

Timestamp:

Feb 26, 2010 12:49:11 PM (15 years ago)

Author:

vboxsync

Message:

AMD-V support for large pages (64 bits host, nested paging)

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (3 diffs)

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

@@ -2955 +2955 @@
     Assert(!PdeDst.n.u1Present); /* We're only supposed to call SyncPT on PDE!P and conflicts.*/
 
-# if (PGM_SHW_TYPE == PGM_TYPE_EPT) && (HC_ARCH_BITS == 64) && defined(RT_OS_WINDOWS)
+# if (HC_ARCH_BITS == 64) && (PGM_SHW_TYPE != PGM_TYPE_32BIT && PGM_SHW_TYPE != PGM_TYPE_PAE)
+#  if  (PGM_SHW_TYPE != PGM_TYPE_EPT)   /* PGM_TYPE_EPT implies nested paging */
+    if (HWACCMIsNestedPagingActive(pVM))
+#  endif 
     {
         PPGMPAGE pPage;
@@ -2991 +2994 @@
                 PdeDst.n.u1Present   = 1;
                 PdeDst.n.u1Write     = 1;
+                PdeDst.b.u1Size      = 1;
+#  if  PGM_SHW_TYPE == PGM_TYPE_EPT
                 PdeDst.n.u1Execute   = 1;
-                PdeDst.b.u1Size      = 1;
                 PdeDst.b.u1IgnorePAT = 1;
                 PdeDst.b.u3EMT       = VMX_EPT_MEMTYPE_WB;
+#  endif
                 ASMAtomicWriteSize(pPdeDst, PdeDst.u);
 
@@ -3002 +3007 @@
         }
     }
-# endif
+# endif /* HC_ARCH_BITS == 64 */
 
     GSTPDE PdeSrc;