From: Sheng Yang <sh...@linux.intel.com>
The vtd.c has renamed to iommu.c, and config option has changed to
CONFIG_IOMMU_API.
Notice now the host kernel before 2.6.29 can't work with VT-d due to API
changed... At least this patch enabled building with host kernel before 2.6.29
with CONFIG_DMAR.
Signed-off-by: Wei Huang <wei.w.hu...@intel.com>
Signed-off-by: Sheng Yang <sh...@linux.intel.com>
Signed-off-by: Avi Kivity <a...@redhat.com>
diff --git a/kernel/ia64/Kbuild b/kernel/ia64/Kbuild
index 130ec45..5bc6098 100644
--- a/kernel/ia64/Kbuild
+++ b/kernel/ia64/Kbuild
@@ -3,8 +3,8 @@ obj-m := kvm.o kvm-intel.o
kvm-objs := kvm_main.o ioapic.o coalesced_mmio.o kvm-ia64.o kvm_fw.o \
irq_comm.o ../anon_inodes.o ../external-module-compat.o
-ifeq ($(CONFIG_DMAR),y)
-kvm-objs += vtd.o
+ifeq ($(CONFIG_IOMMU_API),y)
+kvm-objs += iommu.o
endif
EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
diff --git a/kernel/x86/Kbuild b/kernel/x86/Kbuild
index c4723b1..4ef1168 100644
--- a/kernel/x86/Kbuild
+++ b/kernel/x86/Kbuild
@@ -9,8 +9,8 @@ kvm-objs := kvm_main.o x86.o mmu.o x86_emulate.o
../anon_inodes.o irq.o i8259.o
ifeq ($(EXT_CONFIG_KVM_TRACE),y)
kvm-objs += kvm_trace.o
endif
-ifeq ($(CONFIG_DMAR),y)
-kvm-objs += vtd.o
+ifeq ($(CONFIG_IOMMU_API),y)
+kvm-objs += iommu.o
endif
kvm-intel-objs := vmx.o vmx-debug.o ../external-module-compat.o
kvm-amd-objs := svm.o ../external-module-compat.o
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
