Changeset 102386 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 29, 2023 10:16:05 PM (16 months ago)

Author:

vboxsync

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

160522

Message:

VMM/CPUMR3CpuId.cpp: Don't assert for HostFeatures.fMtrr on non-x86 hosts; correct confusing comments about host when it meant CPU profile. bugref:10318

File:

• trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -3303 +3303 @@
             }
 
-            /* Setup MTRR capability based on what the host supports. */
+            /* Setup MTRR capability based on what the guest CPU profile (typically host) supports. */
             Assert(!pVM->cpum.s.fMtrrWrite || pVM->cpum.s.fMtrrRead);
             if (pVM->cpum.s.fMtrrRead)
             {
+#ifdef RT_ARCH_AMD64
                 Assert(pVM->cpum.s.HostFeatures.fMtrr);
-
-                /* Lookup the number of variable-range MTRRs supported on the host. */
+#endif
+                /* Lookup the number of variable-range MTRRs supported by the CPU profile. */
                 PCCPUMMSRRANGE pMtrrCapRange = cpumLookupMsrRange(pVM, MSR_IA32_MTRR_CAP);
                 AssertLogRelReturn(pMtrrCapRange, VERR_CPUM_IPE_2);
-                uint8_t const cHostVarRangeRegs = pMtrrCapRange->uValue & MSR_IA32_MTRR_CAP_VCNT_MASK;
+                uint8_t const cProfileVarRangeRegs = pMtrrCapRange->uValue & MSR_IA32_MTRR_CAP_VCNT_MASK;
 
                 /* Construct guest MTRR support capabilities. */
-                uint8_t const  cGuestVarRangeRegs = RT_MIN(cHostVarRangeRegs, CPUMCTX_MAX_MTRRVAR_COUNT);
+                uint8_t const  cGuestVarRangeRegs = RT_MIN(cProfileVarRangeRegs, CPUMCTX_MAX_MTRRVAR_COUNT);
                 uint64_t const uGstMtrrCap        = cGuestVarRangeRegs
                                                   | MSR_IA32_MTRR_CAP_FIX