KVM: Remove inject_pending_vectors() callback

It is the same as inject_pending_irq() for VMX/SVM now.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index ea3741edbec3e1c580ec228820fe9339e82034b2..aa5a54eb4da4b33b26ddcfa9fdbdde24ac96b770 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -517,8 +517,6 @@ struct kvm_x86_ops {
        void (*queue_exception)(struct kvm_vcpu *vcpu, unsigned nr,
                                bool has_error_code, u32 error_code);
        void (*inject_pending_irq)(struct kvm_vcpu *vcpu, struct kvm_run *run);
-       void (*inject_pending_vectors)(struct kvm_vcpu *vcpu,
-                                      struct kvm_run *run);
        int (*interrupt_allowed)(struct kvm_vcpu *vcpu);
        int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);
        int (*get_tdp_level)(void);

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 8fa5a0ead6809cc899392bc118f502b3657e2414..290547537b4dda7f58dcc029357134daf8df2505 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2655,7 +2655,6 @@ static struct kvm_x86_ops svm_x86_ops = {
        .set_irq = svm_set_irq,
        .queue_exception = svm_queue_exception,
        .inject_pending_irq = svm_intr_assist,
-       .inject_pending_vectors = svm_intr_assist,
        .interrupt_allowed = svm_interrupt_allowed,
 
        .set_tss_addr = svm_set_tss_addr,

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 3186fcfcffb5c7cb24545bf5ea85328997c32cce..9162b4cd341097d452f5c89f29092cd46909ac54 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3693,7 +3693,6 @@ static struct kvm_x86_ops vmx_x86_ops = {
        .set_irq = vmx_inject_irq,
        .queue_exception = vmx_queue_exception,
        .inject_pending_irq = vmx_intr_assist,
-       .inject_pending_vectors = vmx_intr_assist,
        .interrupt_allowed = vmx_interrupt_allowed,
        .set_tss_addr = vmx_set_tss_addr,
        .get_tdp_level = get_ept_level,

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index b81970b053b98eeb2f142b429450978c8f75f5c5..0890df9e88ff51c55675c9c2817855b5a2d71348 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3171,10 +3171,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
        if (vcpu->arch.exception.pending)
                __queue_exception(vcpu);
-       else if (irqchip_in_kernel(vcpu->kvm))
-               kvm_x86_ops->inject_pending_irq(vcpu, kvm_run);
        else
-               kvm_x86_ops->inject_pending_vectors(vcpu, kvm_run);
+               kvm_x86_ops->inject_pending_irq(vcpu, kvm_run);
 
        kvm_lapic_sync_to_vapic(vcpu);