From 5cc10d472dab656b5a67ff77366526e84c1ce148 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng@linux.intel.com>
Date: Tue, 28 Apr 2009 12:10:45 -0700
Subject: [PATCH 1/2] kvm: external module: 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 <wei.w.huang@intel.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit f4d1fb9baa37ac54414ea21d910937a33d885e9a)
Signed-off-by: Chris Wright <chrisw@redhat.com>
Bugzilla: 498071
Message-ID: <20090428191045.GB17091@x200.localdomain>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Upstream-status: applied(commit f4d1fb9baa37ac54414ea21d910937a33d885e9a)
Acked-by: Don Dutile <ddutile@redhat.com>
Acked-by: Zachary Amsden <zamsden@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
---
 kernel/ia64/Kbuild |    4 ++--
 kernel/x86/Kbuild  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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
-- 
1.6.3.rc4.29.g8146