github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 06:51:49 +00:00
Code Issues Projects Releases Wiki Activity

hv: use ARRAY_SIZE to calc local array size

Browse Source 
if one array just used in local only, and its size not used extern,
use ARRAY_SIZE macro to calculate its size.

Tracked-On: #6307
Signed-off-by: Minggui Cao <minggui.cao@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Minggui Cao 2021-07-19 10:53:23 +08:00 committed by wenlingz
parent 9d650ccdf0
commit a7b7b9d864
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hypervisor/arch/x86/guest/vmsr.c
View File

@ -80,8 +80,7 @@ static const uint32_t emulated_guest_msrs[NUM_GUEST_MSRS] = {
#endif
};
#define NUM_MTRR_MSRS 13U
static const uint32_t mtrr_msrs[NUM_MTRR_MSRS] = {
static const uint32_t mtrr_msrs[] = {
MSR_IA32_MTRR_CAP,
MSR_IA32_MTRR_DEF_TYPE,
MSR_IA32_MTRR_FIX64K_00000,
@ -98,13 +97,7 @@ static const uint32_t mtrr_msrs[NUM_MTRR_MSRS] = {
};
/* Following MSRs are intercepted, but it throws GPs for any guest accesses */
#define NUM_ALWAYS_UNSUPPORTED_MSRS 92U
#ifndef CONFIG_NVMX_ENABLED
#define NUM_UNSUPPORTED_MSRS (NUM_ALWAYS_UNSUPPORTED_MSRS + NUM_VMX_MSRS)
#else
#define NUM_UNSUPPORTED_MSRS NUM_ALWAYS_UNSUPPORTED_MSRS
#endif
static const uint32_t unsupported_msrs[NUM_UNSUPPORTED_MSRS] = {
static const uint32_t unsupported_msrs[] = {
/* Variable MTRRs are not supported */
MSR_IA32_MTRR_PHYSBASE_0,
MSR_IA32_MTRR_PHYSMASK_0,
@ -370,13 +363,13 @@ void init_msr_emulation(struct acrn_vcpu *vcpu)
enable_msr_interception(msr_bitmap, emulated_guest_msrs[i], INTERCEPT_READ_WRITE);
}
for (i = 0U; i < NUM_MTRR_MSRS; i++) {
for (i = 0U; i < ARRAY_SIZE(mtrr_msrs); i++) {
enable_msr_interception(msr_bitmap, mtrr_msrs[i], INTERCEPT_READ_WRITE);
}
intercept_x2apic_msrs(msr_bitmap, INTERCEPT_READ_WRITE);
for (i = 0U; i < NUM_UNSUPPORTED_MSRS; i++) {
for (i = 0U; i < ARRAY_SIZE(unsupported_msrs); i++) {
enable_msr_interception(msr_bitmap, unsupported_msrs[i], INTERCEPT_READ_WRITE);
}