diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-09-15 22:26:50 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-09-15 22:26:50 +0000 |
| commit | b8a2b40645916abaa1f69fa377fed19d466a33bb (patch) | |
| tree | a5b3e1d98389d7f20a27cb93e6b4af6b1652284b /src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp | |
| parent | 2ab136cea8873aa4def376349b8aac820da4a001 (diff) | |
| download | VirtualBox-svn-b8a2b40645916abaa1f69fa377fed19d466a33bb.tar.gz | |
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
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@91266 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp')
| -rw-r--r-- | src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp b/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp index 827c5dd30ee..da4108b722e 100644 --- a/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp +++ b/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp @@ -5516,10 +5516,10 @@ PCPUMMSRRANGE cpumLookupMsrRange(PVM pVM, uint32_t idMsr) /* * 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 (;;) { uint32_t i = cRanges / 2; @@ -5549,8 +5549,8 @@ PCPUMMSRRANGE cpumLookupMsrRange(PVM pVM, uint32_t idMsr) /* * 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) { if (idMsr >= pCur->uFirst && idMsr <= pCur->uLast) |