Now we have irq mask notifiers available in generic KVM along with irq ack notifiers, so rename kvm_irq_has_notifier() to kvm_irq_has_ack_notifier() to make it clear which notifier it is about. Signed-off-by: Dmytro Maluka <dmy@xxxxxxxxxxxx> --- arch/x86/kvm/ioapic.c | 2 +- include/linux/kvm_host.h | 2 +- virt/kvm/eventfd.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c index fab11de1f885..20d758ac2234 100644 --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c @@ -291,7 +291,7 @@ void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, ulong *ioapic_handled_vectors) for (index = 0; index < IOAPIC_NUM_PINS; index++) { e = &ioapic->redirtbl[index]; if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG || - kvm_irq_has_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC, index) || + kvm_irq_has_ack_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC, index) || index == RTC_GSI) { u16 dm = kvm_lapic_irq_dest_mode(!!e->fields.dest_mode); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 55233eb18eb4..ba18276691e1 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1601,7 +1601,7 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *irq_entry, struct kvm *kvm, int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, struct kvm *kvm, int irq_source_id, int level, bool line_status); -bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin); +bool kvm_irq_has_ack_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin); void kvm_notify_acked_gsi(struct kvm *kvm, int gsi); void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin); void kvm_register_irq_ack_notifier(struct kvm *kvm, diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index 72de942dbb9c..4dd7b6f2da69 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -502,7 +502,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args) return ret; } -bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin) +bool kvm_irq_has_ack_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin) { struct kvm_irq_ack_notifier *kian; int gsi, idx; @@ -521,7 +521,7 @@ bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin) return false; } -EXPORT_SYMBOL_GPL(kvm_irq_has_notifier); +EXPORT_SYMBOL_GPL(kvm_irq_has_ack_notifier); void kvm_notify_acked_gsi(struct kvm *kvm, int gsi) { -- 2.37.1.559.g78731f0fdb-goog