Changeset 27167 in vbox for trunk

Timestamp:

Mar 8, 2010 2:19:31 PM (15 years ago)

Author:

vboxsync

Message:

Large page support enabled as configured.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (4 diffs)
• HWACCMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -324 +324 @@
 
     pVM->hwaccm.s.fNestedPaging  = false;
+    pVM->hwaccm.s.fLargePages    = false;
 
     /* Disabled by default. */
@@ -335 +336 @@
     /* Nested paging: disabled by default. */
     rc = CFGMR3QueryBoolDef(pHWVirtExt, "EnableNestedPaging", &pVM->hwaccm.s.fAllowNestedPaging, false);
+    AssertRC(rc);
+
+    /* Large pages: disabled by default. */
+    rc = CFGMR3QueryBoolDef(pHWVirtExt, "EnableLargePages", &pVM->hwaccm.s.fLargePages, false);
     AssertRC(rc);
 
@@ -1158 +1163 @@
                         LogRel(("HWACCM: Unrestricted guest execution enabled!\n"));
 
-#ifdef DEBUG_sandervl
-                    /* Use large (2 MB) pages for our EPT PDEs where possible. */
-                    PGMSetLargePageUsage(pVM, true);
+#if HC_ARCH_BITS == 64
+                    if (pVM->hwaccm.s.fLargePages)
+                    {
+                        /* Use large (2 MB) pages for our EPT PDEs where possible. */
+                        PGMSetLargePageUsage(pVM, true);
+                        LogRel(("HWACCM: Large page support enabled!\n"));
+                    }
 #endif
                 }
@@ -1281 +1290 @@
                 if (pVM->hwaccm.s.fNestedPaging)
                 {
-#ifdef DEBUG_sandervl
-                    /* Use large (2 MB) pages for our EPT PDEs where possible. */
-                    PGMSetLargePageUsage(pVM, true);
+#if HC_ARCH_BITS == 64
+                    if (pVM->hwaccm.s.fLargePages)
+                    {
+                        /* Use large (2 MB) pages for our EPT PDEs where possible. */
+                        PGMSetLargePageUsage(pVM, true);
+                        LogRel(("HWACCM: Large page support enabled!\n"));
+                    }
 #endif
                     LogRel(("HWACCM:    Enabled nested paging\n"));

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -260 +260 @@
     bool                        fAllowNestedPaging;
 
+    /** Set if large pages are enabled (requires nested paging). */
+    bool                        fLargePages;
+
     /** Set if we can support 64-bit guests or not. */
     bool                        fAllow64BitGuests;
@@ -274 +277 @@
     /** Set when TPR patching is active. */
     bool                        fTPRPatchingActive;
-    bool                        u8Alignment[7];
+    bool                        u8Alignment[6];
 
     /** And mask for copying register contents. */