From 273381b3726825ea3b70d09ad7f2bbd66da5a1d1 Mon Sep 17 00:00:00 2001 From: Binbin Wu Date: Fri, 22 Mar 2019 09:21:14 +0800 Subject: [PATCH] hv: vmsr: rename msr_num to msr_index in struct msr_store_entry Rename the field msr_num to msr_index, which is more accurate, in struct msr_store_entry. Tracked-On: #2834 Signed-off-by: Binbin Wu Reviewed-by: Eddie Dong --- hypervisor/arch/x86/guest/vmsr.c | 4 ++-- hypervisor/debug/profiling.c | 2 +- hypervisor/include/arch/x86/guest/vcpu.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hypervisor/arch/x86/guest/vmsr.c b/hypervisor/arch/x86/guest/vmsr.c index f06a8bb29..eafce7cf9 100644 --- a/hypervisor/arch/x86/guest/vmsr.c +++ b/hypervisor/arch/x86/guest/vmsr.c @@ -328,9 +328,9 @@ static void intercept_x2apic_msrs(uint8_t *msr_bitmap_arg, uint32_t mode) static void init_msr_area(struct acrn_vcpu *vcpu) { - vcpu->arch.msr_area.guest[MSR_AREA_TSC_AUX].msr_num = MSR_IA32_TSC_AUX; + vcpu->arch.msr_area.guest[MSR_AREA_TSC_AUX].msr_index = MSR_IA32_TSC_AUX; vcpu->arch.msr_area.guest[MSR_AREA_TSC_AUX].value = vcpu->vcpu_id; - vcpu->arch.msr_area.host[MSR_AREA_TSC_AUX].msr_num = MSR_IA32_TSC_AUX; + vcpu->arch.msr_area.host[MSR_AREA_TSC_AUX].msr_index = MSR_IA32_TSC_AUX; vcpu->arch.msr_area.host[MSR_AREA_TSC_AUX].value = vcpu->pcpu_id; } diff --git a/hypervisor/debug/profiling.c b/hypervisor/debug/profiling.c index d94e242b9..10d454992 100644 --- a/hypervisor/debug/profiling.c +++ b/hypervisor/debug/profiling.c @@ -130,7 +130,7 @@ static void profiling_enable_pmu(void) (void)memcpy_s(ss->vmexit_msr_list, size, vcpu->arch.msr_area.host, size); ss->vmexit_msr_cnt = MAX_HV_MSR_LIST_NUM; - ss->vmexit_msr_list[MAX_HV_MSR_LIST_NUM].msr_num = MSR_IA32_DEBUGCTL; + ss->vmexit_msr_list[MAX_HV_MSR_LIST_NUM].msr_index = MSR_IA32_DEBUGCTL; ss->vmexit_msr_list[MAX_HV_MSR_LIST_NUM].value = ss->guest_debugctl_value & VALID_DEBUGCTL_BIT_MASK; ss->vmexit_msr_cnt++; diff --git a/hypervisor/include/arch/x86/guest/vcpu.h b/hypervisor/include/arch/x86/guest/vcpu.h index 0abec4766..e8ddd0a67 100644 --- a/hypervisor/include/arch/x86/guest/vcpu.h +++ b/hypervisor/include/arch/x86/guest/vcpu.h @@ -235,7 +235,7 @@ struct cpu_context { /* Intel SDM 24.8.2, the address must be 16-byte aligned */ struct msr_store_entry { - uint32_t msr_num; + uint32_t msr_index; uint32_t reserved; uint64_t value; } __aligned(16);