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

Timestamp:

Dec 22, 2015 3:33:10 PM (9 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Add CR4.VMXE check before setting up the VM in ring-0, some column nits.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -2725 +2725 @@
 #endif
 
+    /* At least verify VMX is enabled, since we can't check if we're in VMX root mode without #GP'ing. */
+    RTCCUINTREG uHostCR4 = ASMGetCR4();
+    if (RT_UNLIKELY(!(uHostCR4 & X86_CR4_VMXE)))
+        return VERR_VMX_NOT_IN_VMX_ROOT_MODE;
+
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {
@@ -3100 +3105 @@
 
 /**
- * Figures out if we need to swap the EFER MSR which is
- * particularly expensive.
- *
- * We check all relevant bits. For now, that's everything
- * besides LMA/LME, as these two bits are handled by VM-entry,
- * see hmR0VmxLoadGuestExitCtls() and
+ * Figures out if we need to swap the EFER MSR which is particularly expensive.
+ *
+ * We check all relevant bits. For now, that's everything besides LMA/LME, as
+ * these two bits are handled by VM-entry, see hmR0VmxLoadGuestExitCtls() and
  * hmR0VMxLoadGuestEntryCtls().
  *
@@ -7989 +7992 @@
 
 #ifdef VBOX_STRICT
-    /* Make sure we're in VMX root mode. */
-    RTCCUINTREG u32HostCR4 = ASMGetCR4();
-    if (!(u32HostCR4 & X86_CR4_VMXE))
+    /* At least verify VMX is enabled, since we can't check if we're in VMX root mode without #GP'ing. */
+    RTCCUINTREG uHostCR4 = ASMGetCR4();
+    if (!(uHostCR4 & X86_CR4_VMXE))
     {
         LogRel(("VMXR0Enter: X86_CR4_VMXE bit in CR4 is not set!\n"));