kvm: userspace: change vtd.o to iommu.o in Kbuild
diff mbox

Message ID CF336BA0F635C64F8CC438BC64A259B201C4954C5C@PDSMSX501.ccr.corp.intel.com
State Accepted, archived
Headers show

Commit Message

Huang, Wei W Jan. 8, 2009, 7:27 a.m. UTC
vtd.c has been renamed to iommu.c, need to change it in Kbuild accordingly.

Signed-off-by: Wei Huang <wei.w.huang@intel.com>
---
 kernel/x86/Kbuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Amit Shah Jan. 8, 2009, 12:09 p.m. UTC | #1
On Thu, Jan 08, 2009 at 03:27:12PM +0800, Huang, Wei W wrote:
> vtd.c has been renamed to iommu.c, need to change it in Kbuild accordingly.
> 
> Signed-off-by: Wei Huang <wei.w.huang@intel.com>
> ---
>  kernel/x86/Kbuild |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/kernel/x86/Kbuild b/kernel/x86/Kbuild
> index c4723b1..48339b4 100644
> --- a/kernel/x86/Kbuild
> +++ b/kernel/x86/Kbuild
> @@ -10,7 +10,7 @@ ifeq ($(EXT_CONFIG_KVM_TRACE),y)
>  kvm-objs += kvm_trace.o
>  endif
>  ifeq ($(CONFIG_DMAR),y)
> -kvm-objs += vtd.o
> +kvm-objs += iommu.o

This won't be able to build an older kernel.

Amit
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Han, Weidong Jan. 9, 2009, 1:36 a.m. UTC | #2
Amit Shah wrote:
> On Thu, Jan 08, 2009 at 03:27:12PM +0800, Huang, Wei W wrote:
>> vtd.c has been renamed to iommu.c, need to change it in Kbuild
>> accordingly. 
>> 
>> Signed-off-by: Wei Huang <wei.w.huang@intel.com>
>> ---
>>  kernel/x86/Kbuild |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>> 
>> diff --git a/kernel/x86/Kbuild b/kernel/x86/Kbuild
>> index c4723b1..48339b4 100644
>> --- a/kernel/x86/Kbuild
>> +++ b/kernel/x86/Kbuild
>> @@ -10,7 +10,7 @@ ifeq ($(EXT_CONFIG_KVM_TRACE),y)
>>  kvm-objs += kvm_trace.o
>>  endif
>>  ifeq ($(CONFIG_DMAR),y)
>> -kvm-objs += vtd.o
>> +kvm-objs += iommu.o
> 
> This won't be able to build an older kernel.
> 

Because IOMMU APIs were changed in kernel, it needs external module to support older kernel.

Regards,
Weidong

> Amit

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Zhang, Xiantao Jan. 9, 2009, 1:40 a.m. UTC | #3
Amit Shah wrote:
> On Thu, Jan 08, 2009 at 03:27:12PM +0800, Huang, Wei W wrote:
>> vtd.c has been renamed to iommu.c, need to change it in Kbuild
>> accordingly. 
>> 
>> Signed-off-by: Wei Huang <wei.w.huang@intel.com>
>> ---
>>  kernel/x86/Kbuild |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>> 
>> diff --git a/kernel/x86/Kbuild b/kernel/x86/Kbuild
>> index c4723b1..48339b4 100644
>> --- a/kernel/x86/Kbuild
>> +++ b/kernel/x86/Kbuild
>> @@ -10,7 +10,7 @@ ifeq ($(EXT_CONFIG_KVM_TRACE),y)
>>  kvm-objs += kvm_trace.o
>>  endif
>>  ifeq ($(CONFIG_DMAR),y)
>> -kvm-objs += vtd.o
>> +kvm-objs += iommu.o
> 
> This won't be able to build an older kernel.

Please also modify kernel/ia64/Kbuild together.  I don't think it breaks old kernels, because userspace build only adopts the latest kvm.git.  
Xiantao


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/kernel/x86/Kbuild b/kernel/x86/Kbuild
index c4723b1..48339b4 100644
--- a/kernel/x86/Kbuild
+++ b/kernel/x86/Kbuild
@@ -10,7 +10,7 @@  ifeq ($(EXT_CONFIG_KVM_TRACE),y)
 kvm-objs += kvm_trace.o
 endif
 ifeq ($(CONFIG_DMAR),y)
-kvm-objs += vtd.o
+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