KVM: Move ioapic code to common directory.
Zhang Xiantao [Mon, 17 Dec 2007 06:16:14 +0000 (14:16 +0800)]
Move ioapic code to common, since IA64 also needs it.

Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

arch/x86/kvm/Makefile
virt/kvm/ioapic.c [moved from arch/x86/kvm/ioapic.c with 99% similarity]
virt/kvm/ioapic.h [moved from arch/x86/kvm/ioapic.h with 100% similarity]

index af41534..ffdd0b3 100644 (file)
@@ -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
similarity index 99%
rename from arch/x86/kvm/ioapic.c
rename to virt/kvm/ioapic.c
index 40cd53e..317f8e2 100644 (file)
@@ -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
 
similarity index 100%
rename from arch/x86/kvm/ioapic.h
rename to virt/kvm/ioapic.h