---

yaml --- r: 80850 b: refs/heads/master c: 0eb8f49 h: refs/heads/master v: v3
git-mirror · Jan 30, 2008 · f947d34 · f947d34
1 parent bbbd0b8
commit f947d34
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82470196fa346f50ab4071935597017de33c9ee3
+refs/heads/master: 0eb8f4984824b8a811d44963995133f47813330a
diff --git a/trunk/arch/x86/kvm/Makefile b/trunk/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/trunk/arch/x86/kvm/ioapic.c → trunk/virt/kvm/ioapic.c b/trunk/arch/x86/kvm/ioapic.c → trunk/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/trunk/arch/x86/kvm/ioapic.h → trunk/virt/kvm/ioapic.h b/trunk/arch/x86/kvm/ioapic.h → trunk/virt/kvm/ioapic.h