Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e6d0157 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Paolo Bonzini
Browse files

KVM: x86: revert "add method to test PIR bitmap vector" 



Revert 7c6a98df, given
that testing PIR is not necessary anymore.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f9339860

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -767,7 +767,6 @@ struct kvm_x86_ops { 
	void (*set_virtual_x2apic_mode)(struct kvm_vcpu *vcpu, bool set);

	void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu, hpa_t hpa);

	void (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu, int vector);

	bool (*test_posted_interrupt)(struct kvm_vcpu *vcpu, int vector);

	void (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);

	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);

	int (*get_tdp_level)(void);

arch/x86/kvm/vmx.c

+0 −14
Original line number Diff line number Diff line
@@ -438,11 +438,6 @@ static int pi_test_and_set_pir(int vector, struct pi_desc *pi_desc) 
	return test_and_set_bit(vector, (unsigned long *)pi_desc->pir);

}



static int pi_test_pir(int vector, struct pi_desc *pi_desc)

{

	return test_bit(vector, (unsigned long *)pi_desc->pir);

}



struct vcpu_vmx {

	struct kvm_vcpu       vcpu;

	unsigned long         host_rsp;
@@ -5908,7 +5903,6 @@ static __init int hardware_setup(void) 
		kvm_x86_ops->hwapic_irr_update = NULL;

		kvm_x86_ops->hwapic_isr_update = NULL;

		kvm_x86_ops->deliver_posted_interrupt = NULL;

		kvm_x86_ops->test_posted_interrupt = NULL;

		kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;

	}
@@ -6994,13 +6988,6 @@ static int handle_invvpid(struct kvm_vcpu *vcpu) 
	return 1;

}



static bool vmx_test_pir(struct kvm_vcpu *vcpu, int vector)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);



	return pi_test_pir(vector, &vmx->pi_desc);

}



static int handle_pml_full(struct kvm_vcpu *vcpu)

{

	unsigned long exit_qualification;
@@ -9753,7 +9740,6 @@ static struct kvm_x86_ops vmx_x86_ops = { 
	.hwapic_isr_update = vmx_hwapic_isr_update,

	.sync_pir_to_irr = vmx_sync_pir_to_irr,

	.deliver_posted_interrupt = vmx_deliver_posted_interrupt,

	.test_posted_interrupt = vmx_test_pir,



	.set_tss_addr = vmx_set_tss_addr,

	.get_tdp_level = get_ept_level,