1 files changed, 10 insertions, 5 deletions

diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index a0e88809e45e..369e38010ad5 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -17,6 +17,7 @@
  * Authors:
  *   Yaozu (Eddie) Dong <Eddie.dong@intel.com>
  *
+ * Copyright 2010 Red Hat, Inc. and/or its affilates.
  */
 
 #include <linux/kvm_host.h>
@@ -99,7 +100,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
                         if (r < 0)
                                 r = 0;
                         r += kvm_apic_set_irq(vcpu, irq);
-                } else {
+                } else if (kvm_lapic_enabled(vcpu)) {
                         if (!lowest)
                                 lowest = vcpu;
                         else if (kvm_apic_compare_prio(vcpu, lowest) < 0)
@@ -278,15 +279,19 @@ void kvm_unregister_irq_mask_notifier(struct kvm *kvm, int irq,
         synchronize_rcu();
 }
 
-void kvm_fire_mask_notifiers(struct kvm *kvm, int irq, bool mask)
+void kvm_fire_mask_notifiers(struct kvm *kvm, unsigned irqchip, unsigned pin,
+                             bool mask)
 {
         struct kvm_irq_mask_notifier *kimn;
         struct hlist_node *n;
+        int gsi;
 
         rcu_read_lock();
-        hlist_for_each_entry_rcu(kimn, n, &kvm->mask_notifier_list, link)
-                if (kimn->irq == irq)
-                        kimn->func(kimn, mask);
+        gsi = rcu_dereference(kvm->irq_routing)->chip[irqchip][pin];
+        if (gsi != -1)
+                hlist_for_each_entry_rcu(kimn, n, &kvm->mask_notifier_list, link)
+                        if (kimn->irq == gsi)
+                                kimn->func(kimn, mask);
         rcu_read_unlock();
 }