SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386/kvm: Replace ARRAY_SIZE(msr_handlers) with KVM_MSR_FILTER_MAX_RANGES

Browse Source 
kvm_install_msr_filters() uses KVM_MSR_FILTER_MAX_RANGES as the bound
when traversing msr_handlers[], while other places still compute the
size by ARRAY_SIZE(msr_handlers).

In fact, msr_handlers[] is an array with the fixed size
KVM_MSR_FILTER_MAX_RANGES, and this has to be true because
kvm_install_msr_filters copies from one array to the other.
For code consistency, assert that they match and use
ARRAY_SIZE(msr_handlers) everywehere.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-12-24 16:59:12 +01:00
parent d2401a6eae
commit d662b66da4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/i386/kvm/kvm.c
View File

@ -5854,7 +5854,8 @@ static int kvm_install_msr_filters(KVMState *s)
}; };
int i, j = 0; int i, j = 0;
for (i = 0; i < KVM_MSR_FILTER_MAX_RANGES; i++) { QEMU_BUILD_BUG_ON(ARRAY_SIZE(msr_handlers) != ARRAY_SIZE(filter.ranges));
for (i = 0; i < ARRAY_SIZE(msr_handlers); i++) {
KVMMSRHandlers *handler = &msr_handlers[i]; KVMMSRHandlers *handler = &msr_handlers[i];
if (handler->msr) { if (handler->msr) {
struct kvm_msr_filter_range *range = &filter.ranges[j++]; struct kvm_msr_filter_range *range = &filter.ranges[j++];