Skip to contentSkip to conversation

kvm: Fix build for VT-d/AMD IOMMU

PATCH Applied Sheng Yang 2 participants 2 messages Jan 21, 2009 – Jan 22, 2009 KVM

lore
Share & tools
lore

Sheng Yang

author
#0 lore raw

PATCH 1/1 kvm: Fix build for VT-d/AMD IOMMU

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 <[email protected]>
Signed-off-by Sheng Yang <[email protected]>
---
 kernel/ia64/Kbuild |    4 ++--
 kernel/x86/Kbuild  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
kernel/ia64/Kbuild +2 -2
index 130ec45..5bc6098 100644
@@ -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
kernel/x86/Kbuild +2 -2
index c4723b1..4ef1168 100644
@@ -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
Signature · 1 line
1.5.4.5
Applied
#1 lore raw
Quoted 7 lines · Sheng Yang

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.

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function