Commit 3de42dc0 authored by Xiantao Zhang's avatar Xiantao Zhang Committed by Avi Kivity
Browse files

KVM: Separate irq ack notification out of arch/x86/kvm/irq.c 



Moving irq ack notification logic as common, and make
it shared with ia64 side.

Signed-off-by: default avatarXiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent c77fb9dc

arch/ia64/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -413,6 +413,10 @@ struct kvm_arch { 
	struct kvm_ioapic *vioapic;

	struct kvm_vm_stat stat;

	struct kvm_sal_data rdv_sal_data;



	struct list_head assigned_dev_head;

	struct dmar_domain *intel_iommu_domain;

	struct hlist_head irq_ack_notifier_list;

};



union cpuid3_t {

arch/ia64/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ 
EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/



common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

		coalesced_mmio.o)

		coalesced_mmio.o irq_comm.o)



kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o

obj-$(CONFIG_KVM) += kvm.o

arch/ia64/kvm/irq.h

+0 −5
Original line number Diff line number Diff line
@@ -23,10 +23,5 @@ 
#ifndef __IRQ_H

#define __IRQ_H



struct kvm;



static inline void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi)

{

}



#endif

arch/x86/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

                coalesced_mmio.o)

                coalesced_mmio.o irq_comm.o)

ifeq ($(CONFIG_KVM_TRACE),y)

common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o)

endif

arch/x86/kvm/irq.c

+0 −33
Original line number Diff line number Diff line
@@ -99,36 +99,3 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu) 
	__kvm_migrate_apic_timer(vcpu);

	__kvm_migrate_pit_timer(vcpu);

}
 


/* This should be called with the kvm->lock mutex held */

void kvm_set_irq(struct kvm *kvm, int irq, int level)

{

	/* Not possible to detect if the guest uses the PIC or the

	 * IOAPIC.  So set the bit in both. The guest will ignore

	 * writes to the unused one.

	 */

	kvm_ioapic_set_irq(kvm->arch.vioapic, irq, level);

	kvm_pic_set_irq(pic_irqchip(kvm), irq, level);

}



void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi)

{

	struct kvm_irq_ack_notifier *kian;

	struct hlist_node *n;



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

		if (kian->gsi == gsi)

			kian->irq_acked(kian);

}



void kvm_register_irq_ack_notifier(struct kvm *kvm,

				   struct kvm_irq_ack_notifier *kian)

{

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

}



void kvm_unregister_irq_ack_notifier(struct kvm *kvm,

				     struct kvm_irq_ack_notifier *kian)

{

	hlist_del(&kian->link);

}