Commit 136bdfee authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Move irq ack notifier list to arch independent code 



Mask irq notifier list is already there.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e42bba90

arch/ia64/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -475,7 +475,6 @@ struct kvm_arch { 
	struct list_head assigned_dev_head;

	struct iommu_domain *iommu_domain;

	int iommu_flags;

	struct hlist_head irq_ack_notifier_list;



	unsigned long irq_sources_bitmap;

	unsigned long irq_states[KVM_IOAPIC_NUM_PINS];

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ struct kvm_arch{ 
	struct kvm_pic *vpic;

	struct kvm_ioapic *vioapic;

	struct kvm_pit *vpit;

	struct hlist_head irq_ack_notifier_list;

	int vapics_in_nmi_mode;



	unsigned int tss_addr;

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ struct kvm { 
#ifdef CONFIG_HAVE_KVM_IRQCHIP

	struct kvm_irq_routing_table *irq_routing;

	struct hlist_head mask_notifier_list;

	struct hlist_head irq_ack_notifier_list;

#endif



#ifdef KVM_ARCH_WANT_MMU_NOTIFIER

virt/kvm/irq_comm.c

+2 −3
Original line number Diff line number Diff line
@@ -186,8 +186,7 @@ void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin) 
	rcu_read_unlock();



	if (gsi != -1)

		hlist_for_each_entry(kian, n, &kvm->arch.irq_ack_notifier_list,

				     link)

		hlist_for_each_entry(kian, n, &kvm->irq_ack_notifier_list, link)

			if (kian->gsi == gsi)

				kian->irq_acked(kian);

}
@@ -196,7 +195,7 @@ void kvm_register_irq_ack_notifier(struct kvm *kvm, 
				   struct kvm_irq_ack_notifier *kian)

{

	mutex_lock(&kvm->irq_lock);

	hlist_add_head(&kian->link, &kvm->arch.irq_ack_notifier_list);

	hlist_add_head(&kian->link, &kvm->irq_ack_notifier_list);

	mutex_unlock(&kvm->irq_lock);

}

virt/kvm/kvm_main.c

+1 −0
Original line number Diff line number Diff line
@@ -958,6 +958,7 @@ static struct kvm *kvm_create_vm(void) 
		goto out;

#ifdef CONFIG_HAVE_KVM_IRQCHIP

	INIT_HLIST_HEAD(&kvm->mask_notifier_list);

	INIT_HLIST_HEAD(&kvm->irq_ack_notifier_list);

#endif



#ifdef KVM_COALESCED_MMIO_PAGE_OFFSET