Changeset 42394 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jul 25, 2012 2:12:48 PM (12 years ago)

Author:

vboxsync

Message:

re-applied r79422

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)

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

@@ -1384 +1384 @@
         rc = VMXWriteVMCS(VMX_VMCS_CTRL_EXIT_MSR_LOAD_COUNT, idxMsr);
         AssertRC(rc);
-
-        pVCpu->hwaccm.s.vmx.cCachedMSRs = idxMsr;
 #endif /* VBOX_WITH_AUTO_MSR_LOAD_RESTORE */
 
@@ -2120 +2118 @@
     /*
      * Store all guest MSRs in the VM-entry load area, so they will be loaded
-     * during the world switch.
+     * during VM-entry and restored into the VM-exit store area during VM-exit.
      */
     PVMXMSR pMsr = (PVMXMSR)pVCpu->hwaccm.s.vmx.pGuestMSR;
@@ -2177 +2175 @@
     }
 
-    /*
-     * The number of host MSRs saved must be identical to the number of guest MSRs loaded.
-     * It's not a VT-x requirement but how it's practically used here.
-     */
-    Assert(pVCpu->hwaccm.s.vmx.cCachedMSRs == idxMsr);
+    pVCpu->hwaccm.s.vmx.cCachedMSRs = idxMsr;
 
     rc = VMXWriteVMCS(VMX_VMCS_CTRL_ENTRY_MSR_LOAD_COUNT, idxMsr);