Changeset 73770 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Aug 20, 2018 6:44:55 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Revert r124436 (VMCLEAR is needed for setting launch state which VMPTRLD doesn't touch).

File:

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

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

@@ -2774 +2774 @@
         *(uint32_t *)pVCpu->hm.s.vmx.pvVmcs = RT_BF_GET(pVM->hm.s.vmx.Msrs.u64Basic, VMX_BF_BASIC_VMCS_ID);
 
+        /* Set the VMCS launch state to "clear", see Intel spec. 31.6 "Preparation and launch a virtual machine". */
+        rc  = VMXClearVmcs(pVCpu->hm.s.vmx.HCPhysVmcs);
+        AssertLogRelMsgRCReturnStmt(rc, ("VMXR0SetupVM: VMXClearVmcs failed! rc=%Rrc\n", rc),
+                                    hmR0VmxUpdateErrorRecord(pVCpu, rc), rc);
+
         /* Load this VMCS as the current VMCS. */
         rc = VMXActivateVmcs(pVCpu->hm.s.vmx.HCPhysVmcs);
@@ -2801 +2806 @@
 #endif
 
-        /* Sync the CPU's internal data into our VMCS memory region & set the launch state to "clear". */
+        /* Sync any CPU internal VMCS data back into our VMCS in memory. */
         rc = VMXClearVmcs(pVCpu->hm.s.vmx.HCPhysVmcs);
         AssertLogRelMsgRCReturnStmt(rc, ("VMXR0SetupVM: VMXClearVmcs(2) failed! rc=%Rrc\n", rc),