From f947d3493ac0da068220cd718187cecbb84359f8 Mon Sep 17 00:00:00 2001
From: Zhang Xiantao <xiantao.zhang@intel.com>
Date: Mon, 17 Dec 2007 14:16:14 +0800
Subject: [PATCH] --- yaml --- r: 80850 b: refs/heads/master c:
 0eb8f4984824b8a811d44963995133f47813330a h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/kvm/Makefile           | 7 +++----
 trunk/{arch/x86 => virt}/kvm/ioapic.c | 2 +-
 trunk/{arch/x86 => virt}/kvm/ioapic.h | 0
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename trunk/{arch/x86 => virt}/kvm/ioapic.c (99%)
 rename trunk/{arch/x86 => virt}/kvm/ioapic.h (100%)

diff --git a/[refs] b/[refs]
index a93e6f375f54..bee848119e17 100644
--- 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
index af41534af496..ffdd0b310784 100644
--- 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 b/trunk/virt/kvm/ioapic.c
similarity index 99%
rename from trunk/arch/x86/kvm/ioapic.c
rename to trunk/virt/kvm/ioapic.c
index 40cd53ed4abd..317f8e211cd2 100644
--- a/trunk/arch/x86/kvm/ioapic.c
+++ b/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 b/trunk/virt/kvm/ioapic.h
similarity index 100%
rename from trunk/arch/x86/kvm/ioapic.h
rename to trunk/virt/kvm/ioapic.h