Changeset 24027 in vbox for trunk/src

Timestamp:

Oct 23, 2009 12:17:23 PM (15 years ago)

Author:

vboxsync

Message:

Fail if VT-x or AMD-V are already enabled (Windows 7)

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (1 diff)

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

@@ -83 +83 @@
 #endif
 
+    uint64_t val = ASMRdMsr(MSR_K6_EFER);
+    if (val & MSR_K6_EFER_SVME)
+        return VERR_SVM_IN_USE;
+
     /* Turn on AMD-V in the EFER MSR. */
-    uint64_t val = ASMRdMsr(MSR_K6_EFER);
-    if (!(val & MSR_K6_EFER_SVME))
-        ASMWrMsr(MSR_K6_EFER, val | MSR_K6_EFER_SVME);
+    ASMWrMsr(MSR_K6_EFER, val | MSR_K6_EFER_SVME);
 
     /* Write the physical page address where the CPU will store the host state while executing the VM. */

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

@@ -123 +123 @@
      * (which can have very bad consequences!!!)
      */
+
+    if (ASMGetCR4() & X86_CR4_VMXE))
+        return VERR_VMX_IN_VMX_ROOT_MODE;
 
     /* Make sure the VMX instructions don't cause #UD faults. */