On Mon, 2013-05-06 at 17:21 +1000, aik@xxxxxxxxx wrote: > From: Alexey Kardashevskiy <aik@xxxxxxxxx> > > 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 <aik@xxxxxxxxx> > Cc: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx> > Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx> > --- > 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 kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html