Commit 77c3323f authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

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: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20211108152819.12485-2-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 760849b1

arch/x86/kvm/hyperv.c

+2 −2
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ static int kvm_hv_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host) 


		if (!(data & HV_X64_MSR_VP_ASSIST_PAGE_ENABLE)) {

			hv_vcpu->hv_vapic = data;

			if (kvm_lapic_enable_pv_eoi(vcpu, 0, 0))

			if (kvm_lapic_set_pv_eoi(vcpu, 0, 0))

				return 1;

			break;

		}
@@ -1490,7 +1490,7 @@ static int kvm_hv_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host) 
			return 1;

		hv_vcpu->hv_vapic = data;

		kvm_vcpu_mark_page_dirty(vcpu, gfn);

		if (kvm_lapic_enable_pv_eoi(vcpu,

		if (kvm_lapic_set_pv_eoi(vcpu,

					    gfn_to_gpa(gfn) | KVM_MSR_ENABLED,

					    sizeof(struct hv_vp_assist_page)))

			return 1;

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -2852,7 +2852,7 @@ int kvm_hv_vapic_msr_read(struct kvm_vcpu *vcpu, u32 reg, u64 *data) 
	return 0;

}



int kvm_lapic_enable_pv_eoi(struct kvm_vcpu *vcpu, u64 data, unsigned long len)

int kvm_lapic_set_pv_eoi(struct kvm_vcpu *vcpu, u64 data, unsigned long len)

{

	u64 addr = data & ~KVM_MSR_ENABLED;

	struct gfn_to_hva_cache *ghc = &vcpu->arch.pv_eoi.data;

arch/x86/kvm/lapic.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int kvm_x2apic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data); 
int kvm_hv_vapic_msr_write(struct kvm_vcpu *vcpu, u32 msr, u64 data);

int kvm_hv_vapic_msr_read(struct kvm_vcpu *vcpu, u32 msr, u64 *data);



int kvm_lapic_enable_pv_eoi(struct kvm_vcpu *vcpu, u64 data, unsigned long len);

int kvm_lapic_set_pv_eoi(struct kvm_vcpu *vcpu, u64 data, unsigned long len);

void kvm_lapic_exit(void);



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

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -3556,7 +3556,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		if (!guest_pv_has(vcpu, KVM_FEATURE_PV_EOI))

			return 1;



		if (kvm_lapic_enable_pv_eoi(vcpu, data, sizeof(u8)))

		if (kvm_lapic_set_pv_eoi(vcpu, data, sizeof(u8)))

			return 1;

		break;