Re: [PATCH] KVM: Fix signature of kvm_iommu_map_pages stub

[Jan Kiszka <jan.kiszka@siemens.com>]

Am 14.10.2010 13:59, Jan Kiszka wrote:
> Breaks otherwise if CONFIG_IOMMU_API is not set.

Actually, it only broke a special local version. It doesn't break with
current KVM due to

[__kvm_set_memory_region:]
#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

And CONFIG_IOMMU_API is set when CONFIG_DMAR is enabled. But do we only
need this call on Intel?

Jan

> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  include/linux/kvm_host.h |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index 0b89d00..866ed30 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -483,8 +483,7 @@ int kvm_deassign_device(struct kvm *kvm,
>  			struct kvm_assigned_dev_kernel *assigned_dev);
>  #else /* CONFIG_IOMMU_API */
>  static inline int kvm_iommu_map_pages(struct kvm *kvm,
> -				      gfn_t base_gfn,
> -				      unsigned long npages)
> +				      struct kvm_memory_slot *slot)
>  {
>  	return 0;
>  }

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux