Skip to content

Commit 77c3323

Browse files
vittyvkbonzini
authored andcommitted
KVM: x86: Rename kvm_lapic_enable_pv_eoi()
kvm_lapic_enable_pv_eoi() is a misnomer as the function is also used to disable PV EOI. Rename it to kvm_lapic_set_pv_eoi(). No functional change intended. Signed-off-by: Vitaly Kuznetsov <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 760849b commit 77c3323

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

arch/x86/kvm/hyperv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ static int kvm_hv_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host)
14721472

14731473
if (!(data & HV_X64_MSR_VP_ASSIST_PAGE_ENABLE)) {
14741474
hv_vcpu->hv_vapic = data;
1475-
if (kvm_lapic_enable_pv_eoi(vcpu, 0, 0))
1475+
if (kvm_lapic_set_pv_eoi(vcpu, 0, 0))
14761476
return 1;
14771477
break;
14781478
}
@@ -1490,7 +1490,7 @@ static int kvm_hv_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host)
14901490
return 1;
14911491
hv_vcpu->hv_vapic = data;
14921492
kvm_vcpu_mark_page_dirty(vcpu, gfn);
1493-
if (kvm_lapic_enable_pv_eoi(vcpu,
1493+
if (kvm_lapic_set_pv_eoi(vcpu,
14941494
gfn_to_gpa(gfn) | KVM_MSR_ENABLED,
14951495
sizeof(struct hv_vp_assist_page)))
14961496
return 1;

arch/x86/kvm/lapic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2852,7 +2852,7 @@ int kvm_hv_vapic_msr_read(struct kvm_vcpu *vcpu, u32 reg, u64 *data)
28522852
return 0;
28532853
}
28542854

2855-
int kvm_lapic_enable_pv_eoi(struct kvm_vcpu *vcpu, u64 data, unsigned long len)
2855+
int kvm_lapic_set_pv_eoi(struct kvm_vcpu *vcpu, u64 data, unsigned long len)
28562856
{
28572857
u64 addr = data & ~KVM_MSR_ENABLED;
28582858
struct gfn_to_hva_cache *ghc = &vcpu->arch.pv_eoi.data;

arch/x86/kvm/lapic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ int kvm_x2apic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data);
127127
int kvm_hv_vapic_msr_write(struct kvm_vcpu *vcpu, u32 msr, u64 data);
128128
int kvm_hv_vapic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data);
129129

130-
int kvm_lapic_enable_pv_eoi(struct kvm_vcpu *vcpu, u64 data, unsigned long len);
130+
int kvm_lapic_set_pv_eoi(struct kvm_vcpu *vcpu, u64 data, unsigned long len);
131131
void kvm_lapic_exit(void);
132132

133133
#define VEC_POS(v) ((v) & (32 - 1))

arch/x86/kvm/x86.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3556,7 +3556,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
35563556
if (!guest_pv_has(vcpu, KVM_FEATURE_PV_EOI))
35573557
return 1;
35583558

3559-
if (kvm_lapic_enable_pv_eoi(vcpu, data, sizeof(u8)))
3559+
if (kvm_lapic_set_pv_eoi(vcpu, data, sizeof(u8)))
35603560
return 1;
35613561
break;
35623562

0 commit comments

Comments
 (0)