Re: [PATCH] KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages

["Roedel, Joerg" <Joerg.Roedel@amd.com>]

On Mon, Oct 18, 2010 at 09:38:40AM -0400, Jan Kiszka wrote:
> We also have to call kvm_iommu_map_pages for CONFIG_AMD_IOMMU. So drop
> the dependency on Intel IOMMU, kvm_iommu_map_pages will be a nop anyway
> if CONFIG_IOMMU_API is not defined.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

Acked-by: Joerg Roedel <joerg.roedel@amd.com>

Is this also a -stable candidate?

> ---
>  virt/kvm/kvm_main.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 1aeeb7f..ac326de 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -705,14 +705,12 @@ skip_lpage:
>  	if (r)
>  		goto out_free;
>  
> -#ifdef CONFIG_DMAR
>  	/* map the pages in iommu page table */
>  	if (npages) {
>  		r = kvm_iommu_map_pages(kvm, &new);
>  		if (r)
>  			goto out_free;
>  	}
> -#endif
>  
>  	r = -ENOMEM;
>  	slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
> -- 
> 1.7.1
> 

-- 
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632