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

Timestamp:

Aug 5, 2014 2:13:40 PM (10 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Renaming nits.

File:

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

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

@@ -1439 +1439 @@
      * Note: If you're adding MSRs here, make sure to update the MSR-bitmap permissions in hmR0VmxSetupProcCtls().
      */
-    if (!(pVCpu->hm.s.vmx.fRestoreHostMsrs & VMX_RESTORE_HOST_MSR_LOADED_GUEST))
+    if (!(pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_LOADED_GUEST))
     {
         pVCpu->hm.s.vmx.u64HostLStarMsr        = ASMRdMsr(MSR_K8_LSTAR);
@@ -1445 +1445 @@
         pVCpu->hm.s.vmx.u64HostSFMaskMsr       = ASMRdMsr(MSR_K8_SF_MASK);
         pVCpu->hm.s.vmx.u64HostKernelGSBaseMsr = ASMRdMsr(MSR_K8_KERNEL_GS_BASE);
-        pVCpu->hm.s.vmx.fRestoreHostMsrs |= VMX_RESTORE_HOST_MSR_SAVED_HOST;
+        pVCpu->hm.s.vmx.fLazyMsrs |= VMX_LAZY_MSRS_SAVED_HOST;
     }
 }
@@ -1474 +1474 @@
 
 /**
- * Saves a set of guests MSRs back into the guest-CPU context.
+ * Saves a set of guest MSRs back into the guest-CPU context.
  *
  * @param   pVCpu       Pointer to the VMCPU.
@@ -1488 +1488 @@
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
 
-    if (pVCpu->hm.s.vmx.fRestoreHostMsrs & VMX_RESTORE_HOST_MSR_LOADED_GUEST)
-    {
-        Assert(pVCpu->hm.s.vmx.fRestoreHostMsrs & VMX_RESTORE_HOST_MSR_SAVED_HOST);
+    if (pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_LOADED_GUEST)
+    {
+        Assert(pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_SAVED_HOST);
         pMixedCtx->msrLSTAR        = ASMRdMsr(MSR_K8_LSTAR);
         pMixedCtx->msrSTAR         = ASMRdMsr(MSR_K6_STAR);
@@ -1519 +1519 @@
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
 
-    Assert(pVCpu->hm.s.vmx.fRestoreHostMsrs & VMX_RESTORE_HOST_MSR_SAVED_HOST);
-    if (!(pVCpu->hm.s.vmx.fRestoreHostMsrs & VMX_RESTORE_HOST_MSR_LOADED_GUEST))
-    {
 #define VMXLOCAL_LAZY_LOAD_GUEST_MSR(uMsr, a_GuestMsr, a_HostMsr) \
     do { \
@@ -1530 +1527 @@
     } while (0)
 
+    Assert(pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_SAVED_HOST);
+    if (!(pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_LOADED_GUEST))
+    {
         VMXLOCAL_LAZY_LOAD_GUEST_MSR(MSR_K8_LSTAR, LSTAR, LStar);
         VMXLOCAL_LAZY_LOAD_GUEST_MSR(MSR_K6_STAR, STAR, Star);
         VMXLOCAL_LAZY_LOAD_GUEST_MSR(MSR_K8_SF_MASK, SFMASK, SFMask);
         VMXLOCAL_LAZY_LOAD_GUEST_MSR(MSR_K8_KERNEL_GS_BASE, KERNELGSBASE, KernelGSBase);
-#undef VMXLOCAL_LAZY_LOAD_GUEST_MSR
+        pVCpu->hm.s.vmx.fLazyMsrs |= VMX_LAZY_MSRS_LOADED_GUEST;
     }
     else
@@ -1543 +1543 @@
         ASMWrMsr(MSR_K8_KERNEL_GS_BASE, pMixedCtx->msrKERNELGSBASE);
     }
-    pVCpu->hm.s.vmx.fRestoreHostMsrs |= VMX_RESTORE_HOST_MSR_LOADED_GUEST;
+
+#undef VMXLOCAL_LAZY_LOAD_GUEST_MSR
 }
 
@@ -1562 +1563 @@
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
 
-    if (pVCpu->hm.s.vmx.fRestoreHostMsrs & VMX_RESTORE_HOST_MSR_LOADED_GUEST)
-    {
-        Assert(pVCpu->hm.s.vmx.fRestoreHostMsrs & VMX_RESTORE_HOST_MSR_SAVED_HOST);
+    if (pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_LOADED_GUEST)
+    {
+        Assert(pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_SAVED_HOST);
         ASMWrMsr(MSR_K8_LSTAR,          pVCpu->hm.s.vmx.u64HostLStarMsr);
         ASMWrMsr(MSR_K6_STAR,           pVCpu->hm.s.vmx.u64HostStarMsr);
@@ -1570 +1571 @@
         ASMWrMsr(MSR_K8_KERNEL_GS_BASE, pVCpu->hm.s.vmx.u64HostKernelGSBaseMsr);
     }
-    pVCpu->hm.s.vmx.fRestoreHostMsrs &= ~(VMX_RESTORE_HOST_MSR_LOADED_GUEST | VMX_RESTORE_HOST_MSR_SAVED_HOST);
+    pVCpu->hm.s.vmx.fLazyMsrs &= ~(VMX_LAZY_MSRS_LOADED_GUEST | VMX_LAZY_MSRS_SAVED_HOST);
 }
 #endif  /* HC_ARCH_BITS == 64 */
@@ -7029 +7030 @@
 
 #if HC_ARCH_BITS == 64
-    /* Restore the host MSRs as we're leaving VT-x context. */
+    /* Restore the lazy host MSRs as we're leaving VT-x context. */
     if (   pVM->hm.s.fAllow64BitGuests
-        && pVCpu->hm.s.vmx.fRestoreHostMsrs)
+        && pVCpu->hm.s.vmx.fLazyMsrs)
     {
         /* We shouldn't reload the guest MSRs without saving it first. */
@@ -7041 +7042 @@
         Assert(HMVMXCPU_GST_IS_UPDATED(pVCpu, HMVMX_UPDATED_GUEST_LAZY_MSRS));
         hmR0VmxLazyRestoreHostMsrs(pVCpu);
-        Assert(!pVCpu->hm.s.vmx.fRestoreHostMsrs);
+        Assert(!pVCpu->hm.s.vmx.fLazyMsrs);
     }
 #endif
@@ -7262 +7263 @@
         pVCpu->hm.s.vmx.fRestoreHostFlags = 0;
 
-        /* Restore the host MSRs as we're leaving VT-x context. */
+        /* Restore the lazy host MSRs as we're leaving VT-x context. */
         if (   pVM->hm.s.fAllow64BitGuests
-            && pVCpu->hm.s.vmx.fRestoreHostMsrs)
+            && pVCpu->hm.s.vmx.fLazyMsrs)
         {
             hmR0VmxLazyRestoreHostMsrs(pVCpu);