Skip to content

Commit 273381b

Browse files
binbinwu1wenlingz
authored andcommitted
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 <binbin.wu@intel.com> Reviewed-by: Eddie Dong <eddie.dong@intel.com>
1 parent 5585084 commit 273381b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

hypervisor/arch/x86/guest/vmsr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,9 @@ static void intercept_x2apic_msrs(uint8_t *msr_bitmap_arg, uint32_t mode)
328328

329329
static void init_msr_area(struct acrn_vcpu *vcpu)
330330
{
331-
vcpu->arch.msr_area.guest[MSR_AREA_TSC_AUX].msr_num = MSR_IA32_TSC_AUX;
331+
vcpu->arch.msr_area.guest[MSR_AREA_TSC_AUX].msr_index = MSR_IA32_TSC_AUX;
332332
vcpu->arch.msr_area.guest[MSR_AREA_TSC_AUX].value = vcpu->vcpu_id;
333-
vcpu->arch.msr_area.host[MSR_AREA_TSC_AUX].msr_num = MSR_IA32_TSC_AUX;
333+
vcpu->arch.msr_area.host[MSR_AREA_TSC_AUX].msr_index = MSR_IA32_TSC_AUX;
334334
vcpu->arch.msr_area.host[MSR_AREA_TSC_AUX].value = vcpu->pcpu_id;
335335
}
336336

hypervisor/debug/profiling.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static void profiling_enable_pmu(void)
130130
(void)memcpy_s(ss->vmexit_msr_list, size, vcpu->arch.msr_area.host, size);
131131
ss->vmexit_msr_cnt = MAX_HV_MSR_LIST_NUM;
132132

133-
ss->vmexit_msr_list[MAX_HV_MSR_LIST_NUM].msr_num = MSR_IA32_DEBUGCTL;
133+
ss->vmexit_msr_list[MAX_HV_MSR_LIST_NUM].msr_index = MSR_IA32_DEBUGCTL;
134134
ss->vmexit_msr_list[MAX_HV_MSR_LIST_NUM].value = ss->guest_debugctl_value & VALID_DEBUGCTL_BIT_MASK;
135135
ss->vmexit_msr_cnt++;
136136

hypervisor/include/arch/x86/guest/vcpu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ struct cpu_context {
235235

236236
/* Intel SDM 24.8.2, the address must be 16-byte aligned */
237237
struct msr_store_entry {
238-
uint32_t msr_num;
238+
uint32_t msr_index;
239239
uint32_t reserved;
240240
uint64_t value;
241241
} __aligned(16);

0 commit comments

Comments
 (0)