From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH] KVM: Fix signature of kvm_iommu_map_pages stub Date: Thu, 14 Oct 2010 14:43:51 +0200 Message-ID: <4CB6FB07.10209@siemens.com> References: <4CB6F088.2060007@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm , Joerg Roedel To: Avi Kivity , Marcelo Tosatti Return-path: Received: from goliath.siemens.de ([192.35.17.28]:16606 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752152Ab0JNMoJ (ORCPT ); Thu, 14 Oct 2010 08:44:09 -0400 In-Reply-To: <4CB6F088.2060007@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 > --- > 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