Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758472Ab3EFVHc (ORCPT ); Mon, 6 May 2013 17:07:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46581 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756350Ab3EFVH3 (ORCPT ); Mon, 6 May 2013 17:07:29 -0400 Message-ID: <1367874436.2868.90.camel@ul30vt.home> Subject: Re: [PATCH 2/5] KVM: PPC: iommu: Add missing kvm_iommu_map_pages/kvm_iommu_unmap_pages From: Alex Williamson To: aik@ozlabs.ru Cc: linuxppc-dev@lists.ozlabs.org, David Gibson , Benjamin Herrenschmidt , Paul Mackerras , Alexander Graf , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, kvm-ppc@vger.kernel.org, linux-pci@vger.kernel.org Date: Mon, 06 May 2013 15:07:16 -0600 In-Reply-To: <51875a36.25ac440a.50d9.ffffe90d@mx.google.com> References: <1367824921-27151-1-git-send-email-y> <51875a36.25ac440a.50d9.ffffe90d@mx.google.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1923 Lines: 55 On Mon, 2013-05-06 at 17:21 +1000, aik@ozlabs.ru wrote: > From: Alexey Kardashevskiy > > The IOMMU API implements groups creating/deletion, device binding > and IOMMU map/unmap operations. > > The PowerPC implementation uses most of the API except map/unmap > operations, which are implemented on POWER using hypercalls. > > However, in order to link a kernel with the CONFIG_IOMMU_API enabled, > the empty kvm_iommu_map_pages/kvm_iommu_unmap_pages have to be > defined, so this defines them. > > Signed-off-by: Alexey Kardashevskiy > Cc: David Gibson > Signed-off-by: Paul Mackerras > --- > arch/powerpc/include/asm/kvm_host.h | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h > index b6a047e..c025d91 100644 > --- a/arch/powerpc/include/asm/kvm_host.h > +++ b/arch/powerpc/include/asm/kvm_host.h > @@ -603,4 +603,18 @@ struct kvm_vcpu_arch { > > #define __KVM_HAVE_ARCH_WQP > > +#ifdef CONFIG_IOMMU_API > +/* POWERPC does not use IOMMU API for mapping/unmapping */ > +static inline int kvm_iommu_map_pages(struct kvm *kvm, > + struct kvm_memory_slot *slot) > +{ > + return 0; > +} > + > +static inline void kvm_iommu_unmap_pages(struct kvm *kvm, > + struct kvm_memory_slot *slot) > +{ > +} > +#endif /* CONFIG_IOMMU_API */ > + > #endif /* __POWERPC_KVM_HOST_H__ */ This is no longer needed, Gleb applied my patch for 3.10 that make all of KVM device assignment dependent on a build config option and the top level kvm_host.h now includes this when that is not set. Thanks, Alex -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/