From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH] KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages Date: Mon, 18 Oct 2010 16:34:01 +0200 Message-ID: <4CBC5AD9.209@siemens.com> References: <4CBC4DE0.6010607@siemens.com> <20101018134821.GA21383@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Avi Kivity , Marcelo Tosatti , kvm To: "Roedel, Joerg" Return-path: Received: from david.siemens.de ([192.35.17.14]:23161 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754311Ab0JROeQ (ORCPT ); Mon, 18 Oct 2010 10:34:16 -0400 In-Reply-To: <20101018134821.GA21383@amd.com> Sender: kvm-owner@vger.kernel.org List-ID: Am 18.10.2010 15:48, Roedel, Joerg wrote: > 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? I can't seriously judge as I was not able to test its effect on real hardware. The patch seems to apply (with mechanical adjustments) down to 2.6.32. If it is considered for stable, it will also take [1] to avoid build breakage without CONFIG_IOMMU_API. Jan [1] http://thread.gmane.org/gmane.comp.emulators.kvm.devel/60954 > >> --- >> 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 >> > -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux