Changeset 10693 in vbox

Timestamp:

Jul 16, 2008 11:48:19 AM (17 years ago)

Author:

vboxsync

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

33410

Message:

Added setting for nested paging (default on).

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (5 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/MachineImpl.cpp (modified) (6 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/MachineImpl.h (modified) (2 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -336 +336 @@
                  "                            [-pae on|off]\n"
                  "                            [-hwvirtex on|off|default]\n"
+                 "                            [-nestedpaging on|off]\n"
                  "                            [-monitorcount <number>]\n"
                  "                            [-bioslogofadein on|off]\n"
@@ -982 +983 @@
             RTPrintf("Hardw. virt.ext: %s\n", hwVirtExEnabled == TSBool_True ? "on" : "off");
     }
+    BOOL HWVirtExNestedPagingEnabled;
+    machine->COMGETTER(HWVirtExNestedPagingEnabled)(&HWVirtExNestedPagingEnabled);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("nestedpaging=\"%s\"\n", HWVirtExNestedPagingEnabled ? "on" : "off");
+    else
+        RTPrintf("Nested Paging:   %s\n", HWVirtExNestedPagingEnabled ? "on" : "off");
 
     MachineState_T machineState;
@@ -3749 +3756 @@
     char *acpi = NULL;
     char *hwvirtex = NULL;
+    char *nestedpaging = NULL;
     char *pae = NULL;
     char *ioapic = NULL;
@@ -3874 +3882 @@
             hwvirtex = argv[i];
         }
+        else if (strcmp(argv[i], "-nestedpaging") == 0)
+        {
+            if (argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            i++;
+            nestedpaging = argv[i];
+        }
         else if (strcmp(argv[i], "-pae") == 0)
         {
@@ -4496 +4511 @@
             {
                 errorArgument("Invalid -hwvirtex argument '%s'", hwvirtex);
+                rc = E_FAIL;
+                break;
+            }
+        }
+        if (nestedpaging)
+        {
+            if (strcmp(nestedpaging, "on") == 0)
+            {
+                CHECK_ERROR(machine, COMSETTER(HWVirtExNestedPagingEnabled)(true));
+            }
+            else if (strcmp(nestedpaging, "off") == 0)
+            {
+                CHECK_ERROR(machine, COMSETTER(HWVirtExNestedPagingEnabled)(false));
+            }
+            else
+            {
+                errorArgument("Invalid -nestedpaging argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -174 +174 @@
     }
 #endif
+
+    /* Nested paging (VT-x/AMD-V) */
+    BOOL fEnableNestedPaging = false;
+    hrc = pMachine->COMGETTER(HWVirtExNestedPagingEnabled)(&fEnableNestedPaging);   H();
+    rc = CFGMR3InsertInteger(pRoot, "EnableNestedPaging", fEnableNestedPaging);     RC_CHECK();
 
     /* Physical Address Extension (PAE) */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -189 +189 @@
     mMonitorCount = 1;
     mHWVirtExEnabled = TSBool_False;
+    mHWVirtExNestedPagingEnabled = true;
     mPAEEnabled = false;
 
@@ -216 +217 @@
         mMonitorCount != that.mMonitorCount ||
         mHWVirtExEnabled != that.mHWVirtExEnabled ||
+        mHWVirtExNestedPagingEnabled != that.mHWVirtExNestedPagingEnabled ||
         mPAEEnabled != that.mPAEEnabled ||
         mClipboardMode != that.mClipboardMode)
@@ -1116 +1118 @@
     return S_OK;
 }
+
+STDMETHODIMP Machine::COMGETTER(HWVirtExNestedPagingEnabled)(BOOL *enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReadLock alock (this);
+
+    *enabled = mHWData->mHWVirtExNestedPagingEnabled;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(HWVirtExNestedPagingEnabled)(BOOL enable)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    HRESULT rc = checkStateDependency (MutableStateDep);
+    CheckComRCReturnRC (rc);
+
+    /** @todo check validity! */
+
+    mHWData.backup();
+    mHWData->mHWVirtExNestedPagingEnabled = enable;
+
+    return S_OK;
+}
+
 
 STDMETHODIMP Machine::COMGETTER(PAEEnabled)(BOOL *enabled)
@@ -4478 +4514 @@
     {
         /* default value in case the node is not there */
-        mHWData->mHWVirtExEnabled = TSBool_Default;
-        mHWData->mPAEEnabled      = false;
+        mHWData->mHWVirtExEnabled             = TSBool_Default;
+        mHWData->mHWVirtExNestedPagingEnabled = true;
+        mHWData->mPAEEnabled                  = false;
 
         Key cpuNode = aNode.findKey ("CPU");
@@ -4495 +4532 @@
                     mHWData->mHWVirtExEnabled = TSBool_Default;
             }
+            /* HardwareVirtExNestedPaging (optional, default is true) */
+            Key HWVirtExNestedPagingNode = cpuNode.findKey ("HardwareVirtExNestedPaging");
+            if (!HWVirtExNestedPagingNode.isNull())
+            {
+                mHWData->mHWVirtExNestedPagingEnabled = HWVirtExNestedPagingNode.value <bool> ("enabled");
+            }
+
             /* PAE (optional, default is false) */
             Key PAENode = cpuNode.findKey ("PAE");
@@ -5861 +5905 @@
         hwVirtExNode.setStringValue ("enabled", value);
 
+        /* Nested paging (optional, default is true) */
+        Key HWVirtExNestedPagingNode = cpuNode.createKey ("HardwareVirtExNestedPaging");
+        HWVirtExNestedPagingNode.setValue <bool> ("enabled", !!mHWData->mHWVirtExNestedPagingEnabled);
+        
         /* PAE (optional, default is false) */
         Key PAENode = cpuNode.createKey ("PAE");

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2511 +2511 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="d6181581-e7c7-418a-b3b6-2da10b11a763"
+     uuid="9966d6d7-8bed-4f18-8553-2486f32957b3"
      wsmap="managed"
      >
@@ -2734 +2734 @@
     </attribute>
 
+    <attribute name="HWVirtExNestedPagingEnabled" type="boolean" default="true">
+      <desc>
+        This setting determines whether VirtualBox will try to make use of
+        the nested paging extension of Intel VT-x and AMD-V. Note that in case 
+        such extensions are not available, they will not be used.
+      </desc>
+    </attribute>
+
     <attribute name="PAEEnabled" type="boolean" default="false">
       <desc>

trunk/src/VBox/Main/include/MachineImpl.h

@@ -240 +240 @@
         ULONG          mMonitorCount;
         TSBool_T       mHWVirtExEnabled;
+        BOOL           mHWVirtExNestedPagingEnabled;
         BOOL           mPAEEnabled;
 
@@ -469 +470 @@
     STDMETHOD(COMGETTER(HWVirtExEnabled))(TSBool_T *enabled);
     STDMETHOD(COMSETTER(HWVirtExEnabled))(TSBool_T enabled);
+    STDMETHOD(COMGETTER(HWVirtExNestedPagingEnabled))(BOOL *enabled);
+    STDMETHOD(COMSETTER(HWVirtExNestedPagingEnabled))(BOOL enabled);
     STDMETHOD(COMGETTER(PAEEnabled))(BOOL *enabled);
     STDMETHOD(COMSETTER(PAEEnabled))(BOOL enabled);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -413 +413 @@
 </xsd:complexType>
 
+<xsd:complexType name="THWVirtExNestedPagingType">
+  <xsd:attribute name="enabled" type="xsd:boolean" default="true"/>
+</xsd:complexType>
+
 <xsd:complexType name="TPAEType">
   <xsd:attribute name="enabled" type="xsd:boolean" default="false"/>
@@ -420 +424 @@
   <xsd:sequence>
     <xsd:element name="HardwareVirtEx" type="THWVirtExType" minOccurs="0"/>
+    <xsd:element name="HardwareVirtExNestedPaging" type="THWVirtExNestedPagingType" minOccurs="0"/>
     <xsd:element name="PAE" type="TPAEType" minOccurs="0"/>
   </xsd:sequence>