KVM: Move ioapic code to common directory.

Move ioapic code to common, since IA64 also needs it. Signed-off-by: Zhang Xiantao <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
mrcsosa · Jan 30, 2008 · 0eb8f49 · 0eb8f49
1 parent 8247019
commit 0eb8f49
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
@@ -2,12 +2,11 @@
 # Makefile for Kernel-based Virtual Machine module
 #
 
-common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o)
+common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o)
 
-EXTRA_CFLAGS += -I virt/kvm
+EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm
 
-kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \
-	ioapic.o
+kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o
 obj-$(CONFIG_KVM) += kvm.o
 kvm-intel-objs = vmx.o
 obj-$(CONFIG_KVM_INTEL) += kvm-intel.o

diff --git a/arch/x86/kvm/ioapic.c → virt/kvm/ioapic.c b/arch/x86/kvm/ioapic.c → virt/kvm/ioapic.c
@@ -363,7 +363,7 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
 		break;
 #ifdef	CONFIG_IA64
 	case IOAPIC_REG_EOI:
-		kvm_ioapic_update_eoi(ioapic, data);
+		kvm_ioapic_update_eoi(ioapic->kvm, data);
 		break;
 #endif
 

diff --git a/arch/x86/kvm/ioapic.h → virt/kvm/ioapic.h b/arch/x86/kvm/ioapic.h → virt/kvm/ioapic.h