From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Roedel, Joerg" Subject: Re: [PATCH] KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages Date: Mon, 18 Oct 2010 15:48:21 +0200 Message-ID: <20101018134821.GA21383@amd.com> References: <4CBC4DE0.6010607@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: Avi Kivity , Marcelo Tosatti , kvm To: Jan Kiszka Return-path: Received: from tx2ehsobe002.messaging.microsoft.com ([65.55.88.12]:7854 "EHLO TX2EHSOBE003.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755102Ab0JRNsP (ORCPT ); Mon, 18 Oct 2010 09:48:15 -0400 Content-Disposition: inline In-Reply-To: <4CBC4DE0.6010607@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 Acked-by: Joerg Roedel 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