From: Zhang xiantao Date: Thu, 11 Sep 2008 05:19:32 +0000 (+0800) Subject: KVM: Device Assignment: Move vtd.c from arch/x86/kvm/ to virt/kvm/ X-Git-Tag: v2.6.28-rc1~269^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=371c01b28e4049d1fbf60a9631cdad98f7cae030;p=linux-2.6-omap-h63xx.git KVM: Device Assignment: Move vtd.c from arch/x86/kvm/ to virt/kvm/ Preparation for kvm/ia64 VT-d support. Signed-off-by: Zhang xiantao Signed-off-by: Avi Kivity --- diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 3072b17447a..7dce593b9c6 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