Changeset 33504 in vbox for trunk

Timestamp:

Oct 27, 2010 1:19:37 PM (14 years ago)

Author:

vboxsync

Message:

Default large page support to on for new VMs or VMs that didn't specify this setting before. (only relevant for nested paging)

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -66 +66 @@
 #include <iprt/cpp/xml.h>               /* xml::XmlFileWriter::s_psz*Suff. */
 #include <iprt/string.h>
+#include <iprt/system.h>
 
 #include <VBox/com/array.h>
@@ -155 +156 @@
 #if HC_ARCH_BITS == 64
     /* Default value decision pending. */
-    mHWVirtExLargePagesEnabled = false;
+    uint64_t cbRam = 0;
+
+    if (    RTSystemQueryTotalRam(&cbRam) == VINF_SUCCESS
+        &&  cbRam >= (UINT64_C(6) * _1G))
+    {
+        mHWVirtExLargePagesEnabled = true;
+    }
+    else
+        mHWVirtExLargePagesEnabled = false;
 #else
     /* Not supported on 32 bits hosts. */

trunk/src/VBox/Main/xml/Settings.cpp

@@ -72 +72 @@
 #include <iprt/ldr.h>
 #include <iprt/cpp/lock.h>
+#include <iprt/system.h>
 
 // generated header
@@ -1531 +1532 @@
           fHardwareVirtExclusive(HWVIRTEXCLUSIVEDEFAULT),
           fNestedPaging(true),
-          fLargePages(false),
           fVPID(true),
           fHardwareVirtForce(false),
@@ -1563 +1563 @@
 #if HC_ARCH_BITS == 64 || defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
     fPAE = true;
+#endif
+
+    /* The default value of large page supports depends on the host:
+     * - 64 bits host -> true if sufficient RAM available.
+     * - 32 bits host -> false
+     */
+#if HC_ARCH_BITS == 64
+    uint64_t cbRam = 0;
+
+    if (    RTSystemQueryTotalRam(&cbRam) == VINF_SUCCESS
+        &&  cbRam >= (UINT64_C(6) * _1G))
+    {
+        fLargePages = true;
+    }
+    else
+        fLargePages = false;
+#else
+    /* Not supported on 32 bits hosts. */
+    fLargePages = false;
 #endif
 }
@@ -3196 +3215 @@
         pelmCPU->setAttribute("executionCap", hw.ulCpuExecutionCap);
 
-    if (hw.fLargePages)
-        pelmCPU->createChild("HardwareVirtExLargePages")->setAttribute("enabled", hw.fLargePages);
+    /* Always save this setting as we have changed the default in 4.0 (on for large memory 64-bit systems). */
+    pelmCPU->createChild("HardwareVirtExLargePages")->setAttribute("enabled", hw.fLargePages);
 
     if (m->sv >= SettingsVersion_v1_9)