KVM: Move ioapic code to common directory.

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>

diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
index af41534af496cf36d1218adc60c51071a25c05df..ffdd0b310784059527a4837ca040400c170db0d2 100644 (file)
--- 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 b/virt/kvm/ioapic.c
similarity index 99%
rename from arch/x86/kvm/ioapic.c
rename to virt/kvm/ioapic.c
index 40cd53ed4abdd2ce2136b01d1b1cb6ebefc70571..317f8e211cd2a136f6a07c8333731dadd0389cbe 100644 (file)
--- a/arch/x86/kvm/ioapic.c
+++ b/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 b/virt/kvm/ioapic.h
similarity index 100%
rename from arch/x86/kvm/ioapic.h
rename to virt/kvm/ioapic.h