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

Timestamp:

Aug 7, 2007 5:23:40 PM (17 years ago)

Author:

vboxsync

Message:

Fail if the CPU is in VMX root mode.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWACCMR0.cpp (modified) (1 diff)
• VMMR0.cpp (modified) (1 diff)

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

@@ -127 +127 @@
                          */
                         ASMSetCR4(pVM->hwaccm.s.vmx.hostCR4 | X86_CR4_VMXE);
+                    }
+
+                    if (    pVM->hwaccm.s.vmx.pVMXONPhys 
+                        &&  pVM->hwaccm.s.vmx.pVMXON)
+                    {
+                        /* Set revision dword at the beginning of the structure. */
+                        *(uint32_t *)pVM->hwaccm.s.vmx.pVMXON = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(pVM->hwaccm.s.vmx.msr.vmx_basic_info);
+
+                        /* Enter VMX Root Mode */
+                        int rc = VMXEnable(pVM->hwaccm.s.vmx.pVMXONPhys);
+                        if (VBOX_FAILURE(rc))
+                        {
+                            /* KVM leaves the CPU in VMX operation. Not only is this not allowed, it will crash the host when we enter raw mode, because
+                             * (a) clearing X86_CR4_VMXE in CR4 causes a #GP
+                             * (b) turning off paging causes a #GP
+                             *
+                             * They should fix their code, but until they do we simply refuse to run.
+                             */
+                            return VERR_VMX_IN_VMX_ROOT_MODE;
+                        }
+                        VMXDisable();
                     }
                 }

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

@@ -174 +174 @@
      * Init VMXM.
      */
-    HWACCMR0Init(pVM);
+    int rc = HWACCMR0Init(pVM);
+    if (VBOX_FAILURE(rc))
+        return rc;
 
     /*
      * Init CPUM.
      */
-    int rc = CPUMR0Init(pVM);
+    rc = CPUMR0Init(pVM);
 
     if (RT_FAILURE(rc))