From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Williamson Subject: [PATCH 2/2] kvm: unpin guest and free iommu domain after deassign last device Date: Thu, 29 Mar 2012 14:10:43 -0600 Message-ID: <20120329201043.16338.19390.stgit@bling.home> References: <20120329200701.16338.19994.stgit@bling.home> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: alex.williamson@redhat.com, avi@redhat.com, jan.kiszka@siemens.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:47215 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759697Ab2C2UKq (ORCPT ); Thu, 29 Mar 2012 16:10:46 -0400 In-Reply-To: <20120329200701.16338.19994.stgit@bling.home> Sender: kvm-owner@vger.kernel.org List-ID: Unpin the guest and free the iommu domain if there are no longer any devices attached. Signed-off-by: Alex Williamson --- virt/kvm/assigned-dev.c | 3 +++ virt/kvm/iommu.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c index 758e3b3..9d6b31a 100644 --- a/virt/kvm/assigned-dev.c +++ b/virt/kvm/assigned-dev.c @@ -673,6 +673,9 @@ static int kvm_vm_ioctl_deassign_device(struct kvm *kvm, kvm_free_assigned_device(kvm, match); + if (list_empty(&kvm->arch.assigned_dev_head)) + kvm_iommu_unmap_guest(kvm); + out: mutex_unlock(&kvm->lock); return r; diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c index fec1723..ee4c236 100644 --- a/virt/kvm/iommu.c +++ b/virt/kvm/iommu.c @@ -342,5 +342,6 @@ int kvm_iommu_unmap_guest(struct kvm *kvm) kvm_iommu_unmap_memslots(kvm); iommu_domain_free(domain); + kvm->arch.iommu_domain = NULL; return 0; }