KVM: APIC: kvm_apic_set_irq deliver all kinds of interrupts

Get rid of ioapic_inj_irq() and ioapic_inj_nmi() functions.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

2 files changed, 7 insertions, 34 deletions

diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index ea268a8c37da..d4a7948b010c 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -142,25 +142,6 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
         }
 }
 
-static int ioapic_inj_irq(struct kvm_ioapic *ioapic,
-                           struct kvm_vcpu *vcpu,
-                           u8 vector, u8 trig_mode, u8 delivery_mode)
-{
-        ioapic_debug("irq %d trig %d deliv %d\n", vector, trig_mode,
-                     delivery_mode);
-
-        ASSERT((delivery_mode == IOAPIC_FIXED) ||
-               (delivery_mode == IOAPIC_LOWEST_PRIORITY));
-
-        return kvm_apic_set_irq(vcpu, vector, trig_mode);
-}
-
-static void ioapic_inj_nmi(struct kvm_vcpu *vcpu)
-{
-        kvm_inject_nmi(vcpu);
-        kvm_vcpu_kick(vcpu);
-}
-
 static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
 {
         union kvm_ioapic_redirect_entry entry = ioapic->redirtbl[irq];
@@ -193,21 +174,12 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
                 __clear_bit(vcpu_id, deliver_bitmask);
                 vcpu = ioapic->kvm->vcpus[vcpu_id];
                 if (vcpu) {
-                        if (entry.fields.delivery_mode ==
-                                        IOAPIC_LOWEST_PRIORITY ||
-                            entry.fields.delivery_mode == IOAPIC_FIXED) {
-                                if (r < 0)
-                                        r = 0;
-                                r += ioapic_inj_irq(ioapic, vcpu,
-                                                    entry.fields.vector,
-                                                    entry.fields.trig_mode,
-                                                    entry.fields.delivery_mode);
-                        } else if (entry.fields.delivery_mode == IOAPIC_NMI) {
-                                r = 1;
-                                ioapic_inj_nmi(vcpu);
-                        } else
-                                ioapic_debug("unsupported delivery mode %x!\n",
-                                             entry.fields.delivery_mode);
+                        if (r < 0)
+                                r = 0;
+                        r += kvm_apic_set_irq(vcpu,
+                                        entry.fields.vector,
+                                        entry.fields.trig_mode,
+                                        entry.fields.delivery_mode);
                 } else
                         ioapic_debug("null destination vcpu: "
                                      "mask=%x vector=%x delivery_mode=%x\n",
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index 1c6ff6d1b842..325c6685f206 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -148,6 +148,7 @@ static int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
                         if (r < 0)
                                 r = 0;
                         r += kvm_apic_set_irq(vcpu, entry.fields.vector,
+                                              entry.fields.dest_mode,
                                               entry.fields.trig_mode);
                 }
         }