Changeset 24027 in vbox for trunk

Timestamp:

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

Author:

vboxsync

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

53872

Message:

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

Location:

trunk

Files:

trunk/include/VBox/err.h

-              r23906
+              r24027
 /** Unable to start VM execution. */
 #define VERR_SVM_UNABLE_TO_START_VM                 (-4050)
 /** SVM bit not set in K6_EFER MSR */
+/** AMD-V bit not set in K6_EFER MSR */
 #define VERR_SVM_ILLEGAL_EFER_MSR                   (-4051)
 /** SVM CPU extension not available. */
+/** AMD-V CPU extension not available. */
 #define VERR_SVM_NO_SVM                             (-4052)
 /** SVM CPU extension disabled (by BIOS). */
+/** AMD-V CPU extension disabled (by BIOS). */
 #define VERR_SVM_DISABLED                           (-4053)
+/** AMD-V CPU extension in-use. */
+#define VERR_SVM_IN_USE                             (-4054)
 /** @} */

-              r23553
+              r24027
 #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. */

-              r23983
+              r24027
      * (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. */

Note: See TracChangeset for help on using the changeset viewer.