Changeset 45475 in vbox

Timestamp:

Apr 10, 2013 9:19:00 PM (12 years ago)

Author:

vboxsync

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

84920

Message:

VMM/VMMR0/HM: comment and todo for problem earlier seen today with assert screwing up VMX state somehow.

File:

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

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

@@ -598 +598 @@
     RTCCUINTREG fFlags = ASMIntDisableFlags();
 
-    /* Enable the VMX bit in CR4. */
+    /* Enable the VMX bit in CR4 if necessary. */
     RTCCUINTREG uCr4 = ASMGetCR4();
     if (!(uCr4 & X86_CR4_VMXE))
         ASMSetCR4(uCr4 | X86_CR4_VMXE);
 
-    /* Enter VMXON root mode. */
-    int rc = VMXEnable(HCPhysCpuPage);
+    /* Enter VMX root mode. */
+    int rc = VMXEnable(HCPhysCpuPage);  /** @todo This would #GP(0) if we are already in VMX root mode... try skip it? */
     if (RT_FAILURE(rc))
         ASMSetCR4(uCr4);
@@ -628 +628 @@
     if (ASMGetCR4() & X86_CR4_VMXE)
     {
-        /* Exit root mode using VMXOFF & clear the VMX bit in CR4 */
+        /* Exit VMX root mode and clear the VMX bit in CR4 */
         VMXDisable();
         ASMSetCR4(ASMGetCR4() & ~X86_CR4_VMXE);