>From e2a97bd0c64b446336b0995126e1e8df2eda9a00 Mon Sep 17 00:00:00 2001
From: Zhang xiantao <xiantao.zhang@xxxxxxxxx>
Date: Thu, 11 Sep 2008 13:19:32 +0800
Subject: [PATCH] kvm/vt-d: Moving vtd.c from arch/x86/kvm/ to virt/kvm/
Preparation for kvm/ia64 VT-d support.
Signed-off-by: Zhang xiantao <xiantao.zhang@xxxxxxxxx>
---
arch/x86/kvm/Makefile | 6 +++---
{arch/x86 => virt}/kvm/vtd.c | 0
2 files changed, 3 insertions(+), 3 deletions(-)
rename {arch/x86 => virt}/kvm/vtd.c (100%)
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
index 3072b17..7dce593 100644
--- a/arch/x86/kvm/Makefile
+++ b/arch/x86/kvm/Makefile
@@ -7,14 +7,14 @@ common-objs = $(addprefix ../../../virt/kvm/,
kvm_main.o ioapic.o \
ifeq ($(CONFIG_KVM_TRACE),y)
common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o)
endif
+ifeq ($(CONFIG_DMAR),y)
+common-objs += $(addprefix ../../../virt/kvm/, vtd.o)
+endif
EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm
kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o
lapic.o \
i8254.o
-ifeq ($(CONFIG_DMAR),y)
-kvm-objs += vtd.o
-endif
obj-$(CONFIG_KVM) += kvm.o
kvm-intel-objs = vmx.o
obj-$(CONFIG_KVM_INTEL) += kvm-intel.o
diff --git a/arch/x86/kvm/vtd.c b/virt/kvm/vtd.c
similarity index 100%
rename from arch/x86/kvm/vtd.c
rename to virt/kvm/vtd.c
--
1.5.1
Attachment:
0001-kvm-vt-d-Moving-vtd.c-from-arch-x86-kvm-to-virt-kv.patch
Description: 0001-kvm-vt-d-Moving-vtd.c-from-arch-x86-kvm-to-virt-kv.patch
