KVM: Return destination vcpu on interrupt injection

Add a new parameter to know vcpus who received the interrupt.

Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
Reviewed-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 1d8906d39214..27ae8dd64e29 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -217,7 +217,7 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq)
         irqe.level = 1;
         irqe.shorthand = 0;
 
-        return kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe);
+        return kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe, NULL);
 }
 
 int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id,
diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h
index 87cd94bae372..761e5b57099e 100644
--- a/virt/kvm/ioapic.h
+++ b/virt/kvm/ioapic.h
@@ -92,7 +92,7 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id,
 void kvm_ioapic_clear_all(struct kvm_ioapic *ioapic, int irq_source_id);
 void kvm_ioapic_reset(struct kvm_ioapic *ioapic);
 int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
-                struct kvm_lapic_irq *irq);
+                struct kvm_lapic_irq *irq, unsigned long *dest_map);
 int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state);
 int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state);
 void kvm_ioapic_make_eoibitmap_request(struct kvm *kvm);
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index e9073cf4d040..2f07d2e59a2d 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -63,7 +63,7 @@ inline static bool kvm_is_dm_lowest_prio(struct kvm_lapic_irq *irq)
 }
 
 int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
-                struct kvm_lapic_irq *irq)
+                struct kvm_lapic_irq *irq, unsigned long *dest_map)
 {
         int i, r = -1;
         struct kvm_vcpu *vcpu, *lowest = NULL;
@@ -74,7 +74,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
                 irq->delivery_mode = APIC_DM_FIXED;
         }
 
-        if (kvm_irq_delivery_to_apic_fast(kvm, src, irq, &r))
+        if (kvm_irq_delivery_to_apic_fast(kvm, src, irq, &r, dest_map))
                 return r;
 
         kvm_for_each_vcpu(i, vcpu, kvm) {
@@ -88,7 +88,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
                 if (!kvm_is_dm_lowest_prio(irq)) {
                         if (r < 0)
                                 r = 0;
-                        r += kvm_apic_set_irq(vcpu, irq);
+                        r += kvm_apic_set_irq(vcpu, irq, dest_map);
                 } else if (kvm_lapic_enabled(vcpu)) {
                         if (!lowest)
                                 lowest = vcpu;
@@ -98,7 +98,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
         }
 
         if (lowest)
-                r = kvm_apic_set_irq(lowest, irq);
+                r = kvm_apic_set_irq(lowest, irq, dest_map);
 
         return r;
 }
@@ -130,7 +130,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
 
         kvm_set_msi_irq(e, &irq);
 
-        return kvm_irq_delivery_to_apic(kvm, NULL, &irq);
+        return kvm_irq_delivery_to_apic(kvm, NULL, &irq, NULL);
 }
 
 
@@ -142,7 +142,7 @@ static int kvm_set_msi_inatomic(struct kvm_kernel_irq_routing_entry *e,
 
         kvm_set_msi_irq(e, &irq);
 
-        if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r))
+        if (kvm_irq_delivery_to_apic_fast(kvm, NULL, &irq, &r, NULL))
                 return r;
         else
                 return -EWOULDBLOCK;