Commit 0eb8f498 authored by Zhang Xiantao's avatar Zhang Xiantao Committed by Avi Kivity
Browse files

KVM: Move ioapic code to common directory. 



Move ioapic code to common, since IA64 also needs it.

Signed-off-by: default avatarZhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 82470196

arch/x86/kvm/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -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

arch/x86/kvm/ioapic.c→virt/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kvm/ioapic.h→virt/kvm/ioapic.h

+0 −0

File moved.

View file