2 files changed, 9 insertions, 5 deletions

diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 1149c60b198f..0b9df8303dcf 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -152,7 +152,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
                 update_handled_vectors(ioapic);
                 mask_after = e->fields.mask;
                 if (mask_before != mask_after)
-                        kvm_fire_mask_notifiers(ioapic->kvm, index, mask_after);
+                        kvm_fire_mask_notifiers(ioapic->kvm, KVM_IRQCHIP_IOAPIC, index, mask_after);
                 if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG
                     && ioapic->irr & (1 << index))
                         ioapic_service(ioapic, index);
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index 06cf61e729d2..369e38010ad5 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -279,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();
 }