Changeset 45804 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 29, 2013 12:03:31 PM (12 years ago)

Author:

vboxsync

Message:

VMX: Added CFGM key to disable unrestricted execution.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/HM.cpp (modified) (2 diffs)
• include/HMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -400 +400 @@
     AssertRCReturn(rc, rc);
 
+    /** @cfgm{/HM/EnableUnrestrictedExec, bool, true}
+     * Enables the VT-x unrestricted execution feature. */
+    rc = CFGMR3QueryBoolDef(pCfgHM, "EnableUnrestrictedExec", &pVM->hm.s.vmx.fAllowUnrestricted, true);
+    AssertRCReturn(rc, rc);
+
     /** @cfgm{/HM/EnableLargePages, bool, false}
      * Enables using large pages (2 MB) for guest memory, thus saving on (nested)
@@ -1127 +1132 @@
     }
 
-    /* Unrestricted guest execution relies on EPT. */
-    if (    pVM->hm.s.fNestedPaging
+    /* Unrestricted guest execution also requires EPT. */
+    if (    pVM->hm.s.vmx.fAllowUnrestricted
+        &&  pVM->hm.s.fNestedPaging
         &&  (pVM->hm.s.vmx.msr.vmx_proc_ctls2.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC2_UNRESTRICTED_GUEST))
         pVM->hm.s.vmx.fUnrestrictedGuest = true;

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

@@ -334 +334 @@
         bool                        fAllowVpid;
 
-        /** Set if unrestricted guest execution is allowed (real and protected mode without paging). */
+        /** Set if unrestricted guest execution is in use (real and protected mode without paging). */
         bool                        fUnrestrictedGuest;
+
+        /** Set if unrestricted guest execution is allowed to be used. */
+        bool                        fAllowUnrestricted;
 
         /** Whether we're using the preemption timer or not. */
@@ -341 +344 @@
         /** The shift mask employed by the VMX-Preemption timer. */
         uint8_t                     cPreemptTimerShift;
-
-        bool                        uAlignment[1];
 
         /** Virtual address of the TSS page used for real mode emulation. */