aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2015-02-02 12:26:09 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2015-02-02 12:36:34 -0500
commit2e6d015799d523dcce11c7d1465e6feb7b69fab1 (patch)
tree508e45138d702de7180bcfbbdead6821feead4bb
parentf9339860384aaa104d85f59b75921941b39a45fc (diff)
KVM: x86: revert "add method to test PIR bitmap vector"
Revert 7c6a98dfa1ba9dc64a62e73624ecea9995736bbd, given that testing PIR is not necessary anymore. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/include/asm/kvm_host.h1
-rw-r--r--arch/x86/kvm/vmx.c14
2 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 57916ecb9b92..9dbc7435cbc2 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -767,7 +767,6 @@ struct kvm_x86_ops {
767 void (*set_virtual_x2apic_mode)(struct kvm_vcpu *vcpu, bool set); 767 void (*set_virtual_x2apic_mode)(struct kvm_vcpu *vcpu, bool set);
768 void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu, hpa_t hpa); 768 void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu, hpa_t hpa);
769 void (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu, int vector); 769 void (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu, int vector);
770 bool (*test_posted_interrupt)(struct kvm_vcpu *vcpu, int vector);
771 void (*sync_pir_to_irr)(struct kvm_vcpu *vcpu); 770 void (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);
772 int (*set_tss_addr)(struct kvm *kvm, unsigned int addr); 771 int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);
773 int (*get_tdp_level)(void); 772 int (*get_tdp_level)(void);
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 81152a070b1f..15b78936c101 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -438,11 +438,6 @@ static int pi_test_and_set_pir(int vector, struct pi_desc *pi_desc)
438 return test_and_set_bit(vector, (unsigned long *)pi_desc->pir); 438 return test_and_set_bit(vector, (unsigned long *)pi_desc->pir);
439} 439}
440 440
441static int pi_test_pir(int vector, struct pi_desc *pi_desc)
442{
443 return test_bit(vector, (unsigned long *)pi_desc->pir);
444}
445
446struct vcpu_vmx { 441struct vcpu_vmx {
447 struct kvm_vcpu vcpu; 442 struct kvm_vcpu vcpu;
448 unsigned long host_rsp; 443 unsigned long host_rsp;
@@ -5908,7 +5903,6 @@ static __init int hardware_setup(void)
5908 kvm_x86_ops->hwapic_irr_update = NULL; 5903 kvm_x86_ops->hwapic_irr_update = NULL;
5909 kvm_x86_ops->hwapic_isr_update = NULL; 5904 kvm_x86_ops->hwapic_isr_update = NULL;
5910 kvm_x86_ops->deliver_posted_interrupt = NULL; 5905 kvm_x86_ops->deliver_posted_interrupt = NULL;
5911 kvm_x86_ops->test_posted_interrupt = NULL;
5912 kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy; 5906 kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
5913 } 5907 }
5914 5908
@@ -6994,13 +6988,6 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)
6994 return 1; 6988 return 1;
6995} 6989}
6996 6990
6997static bool vmx_test_pir(struct kvm_vcpu *vcpu, int vector)
6998{
6999 struct vcpu_vmx *vmx = to_vmx(vcpu);
7000
7001 return pi_test_pir(vector, &vmx->pi_desc);
7002}
7003
7004static int handle_pml_full(struct kvm_vcpu *vcpu) 6991static int handle_pml_full(struct kvm_vcpu *vcpu)
7005{ 6992{
7006 unsigned long exit_qualification; 6993 unsigned long exit_qualification;
@@ -9753,7 +9740,6 @@ static struct kvm_x86_ops vmx_x86_ops = {
9753 .hwapic_isr_update = vmx_hwapic_isr_update, 9740 .hwapic_isr_update = vmx_hwapic_isr_update,
9754 .sync_pir_to_irr = vmx_sync_pir_to_irr, 9741 .sync_pir_to_irr = vmx_sync_pir_to_irr,
9755 .deliver_posted_interrupt = vmx_deliver_posted_interrupt, 9742 .deliver_posted_interrupt = vmx_deliver_posted_interrupt,
9756 .test_posted_interrupt = vmx_test_pir,
9757 9743
9758 .set_tss_addr = vmx_set_tss_addr, 9744 .set_tss_addr = vmx_set_tss_addr,
9759 .get_tdp_level = get_ept_level, 9745 .get_tdp_level = get_ept_level,