Changeset 87563 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 3, 2021 1:23:13 PM (4 years ago)

Author:

vboxsync

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

142590

Message:

VMM/HM: Moved the 'ForRing3' and 'ForLog' bits to the back of the HM structure. Configuration bits too, except for VMX/SVM specific ones as those fit in alignment space (can be moved later if needed). bugref:9217

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMAll.cpp (modified) (1 diff)
• HMSVMAll.cpp (modified) (1 diff)
• HMVMXAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -683 +683 @@
 
         if (   pVM->hm.s.vmx.fSupported
-            && (  CTX_EXPR(pVM->hm.s.vmx.MsrsForRing3.ProcCtls.n.allowed1, g_HmMsrs.u.vmx.ProcCtls.n.allowed1, RT_NOTHING)
+            && (  CTX_EXPR(pVM->hm.s.ForR3.vmx.Msrs.ProcCtls.n.allowed1, g_HmMsrs.u.vmx.ProcCtls.n.allowed1, RT_NOTHING)
                 & VMX_PROC_CTLS_USE_MSR_BITMAPS))
             return true;

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -186 +186 @@
     bool const fVGif    = RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_VGIF);
 #else
-    bool const fVGif    = RT_BOOL(pVM->hm.s.svm.fFeaturesForRing3 & X86_CPUID_SVM_FEATURE_EDX_VGIF);
+    bool const fVGif    = RT_BOOL(pVM->hm.s.ForR3.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_VGIF);
 #endif
     return fVGif && pVM->hm.s.svm.fVGif;

trunk/src/VBox/VMM/VMMAll/HMVMXAll.cpp

@@ -768 +768 @@
     {
         /* If bit N is set in cr0_fixed0, then it must be set in the guest's cr0. */
-        uint32_t uCr0Mask = (uint32_t)CTX_EXPR(pVM->hm.s.vmx.MsrsForRing3.u64Cr0Fixed0, g_HmMsrs.u.vmx.u64Cr0Fixed0, RT_NOTHING);
+        uint32_t uCr0Mask = (uint32_t)CTX_EXPR(pVM->hm.s.ForR3.vmx.Msrs.u64Cr0Fixed0, g_HmMsrs.u.vmx.u64Cr0Fixed0, RT_NOTHING);
 
         /* We ignore the NE bit here on purpose; see HMR0.cpp for details. */
@@ -787 +787 @@
 
         /* If bit N is cleared in cr0_fixed1, then it must be zero in the guest's cr0. */
-        uCr0Mask = (uint32_t)~CTX_EXPR(pVM->hm.s.vmx.MsrsForRing3.u64Cr0Fixed1, g_HmMsrs.u.vmx.u64Cr0Fixed1, RT_NOTHING);
+        uCr0Mask = (uint32_t)~CTX_EXPR(pVM->hm.s.ForR3.vmx.Msrs.u64Cr0Fixed1, g_HmMsrs.u.vmx.u64Cr0Fixed1, RT_NOTHING);
         if ((pCtx->cr0 & uCr0Mask) != 0)
             return false;
 
         /* If bit N is set in cr4_fixed0, then it must be set in the guest's cr4. */
-        uCr0Mask  = (uint32_t)CTX_EXPR(pVM->hm.s.vmx.MsrsForRing3.u64Cr4Fixed0, g_HmMsrs.u.vmx.u64Cr4Fixed0, RT_NOTHING);
+        uCr0Mask  = (uint32_t)CTX_EXPR(pVM->hm.s.ForR3.vmx.Msrs.u64Cr4Fixed0, g_HmMsrs.u.vmx.u64Cr4Fixed0, RT_NOTHING);
         uCr0Mask &= ~X86_CR4_VMXE;
         if ((pCtx->cr4 & uCr0Mask) != uCr0Mask)
@@ -798 +798 @@
 
         /* If bit N is cleared in cr4_fixed1, then it must be zero in the guest's cr4. */
-        uCr0Mask = (uint32_t)~CTX_EXPR(pVM->hm.s.vmx.MsrsForRing3.u64Cr4Fixed1, g_HmMsrs.u.vmx.u64Cr4Fixed1, RT_NOTHING);
+        uCr0Mask = (uint32_t)~CTX_EXPR(pVM->hm.s.ForR3.vmx.Msrs.u64Cr4Fixed1, g_HmMsrs.u.vmx.u64Cr4Fixed1, RT_NOTHING);
         if ((pCtx->cr4 & uCr0Mask) != 0)
             return false;