diff options
| author | Zhang xiantao <xiantao.zhang@intel.com> | 2008-09-11 13:19:32 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-10-15 14:25:32 +0200 |
| commit | 371c01b28e4049d1fbf60a9631cdad98f7cae030 (patch) | |
| tree | 84286c5292b404923d8cf730e06d52a332468da6 | |
| parent | 83dbc83a0d7c88c919d769177bd1924a46c9c034 (diff) | |
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 <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | arch/x86/kvm/Makefile | 6 | ||||
| -rw-r--r-- | virt/kvm/vtd.c (renamed from arch/x86/kvm/vtd.c) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 3072b17447ab..7dce593b9c66 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 index a770874f3a3a..a770874f3a3a 100644 --- a/arch/x86/kvm/vtd.c +++ b/virt/kvm/vtd.c |