Changeset 91266 in vbox for trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

Timestamp:

Sep 15, 2021 10:26:50 PM (3 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Moved CPUIDs and MSRs from the hyper heap and into the VM structure (might not be such a great idea for MSRs actually). bugref:10093

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp (modified) (2 diffs)

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

@@ -5517 +5517 @@
      * Binary lookup.
      */
-    uint32_t        cRanges   = pVM->cpum.s.GuestInfo.cMsrRanges;
+    uint32_t        cRanges   = RT_MIN(pVM->cpum.s.GuestInfo.cMsrRanges, RT_ELEMENTS(pVM->cpum.s.GuestInfo.aMsrRanges));
     if (!cRanges)
         return NULL;
-    PCPUMMSRRANGE   paRanges  = pVM->cpum.s.GuestInfo.CTX_SUFF(paMsrRanges);
+    PCPUMMSRRANGE   paRanges  = pVM->cpum.s.GuestInfo.aMsrRanges;
     for (;;)
     {
@@ -5550 +5550 @@
      * Linear lookup to verify the above binary search.
      */
-    uint32_t        cLeft = pVM->cpum.s.GuestInfo.cMsrRanges;
-    PCPUMMSRRANGE   pCur  = pVM->cpum.s.GuestInfo.CTX_SUFF(paMsrRanges);
+    uint32_t        cLeft = RT_MIN(pVM->cpum.s.GuestInfo.cMsrRanges, RT_ELEMENTS(pVM->cpum.s.GuestInfo.aMsrRanges));
+    PCPUMMSRRANGE   pCur  = pVM->cpum.s.GuestInfo.aMsrRanges;
     while (cLeft-- > 0)
     {