Deassign device in kvm_free_assgined_device

In kvm_iommu_unmap_memslots(), assigned_dev_head is already empty.

Signed-off-by: Weidong Han <weidong.han@intel.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

3 files changed, 2 insertions, 10 deletions

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index ce5d1c17ce26..e62a4629e51c 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -316,6 +316,7 @@ struct kvm_assigned_dev_kernel {
 #define KVM_ASSIGNED_DEV_HOST_MSI       (1 << 9)
         unsigned long irq_requested_type;
         int irq_source_id;
+        int flags;
         struct pci_dev *dev;
         struct kvm *kvm;
 };
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 3238e08e4651..4ef0fb43d1f9 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -496,6 +496,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
         match->assigned_dev_id = assigned_dev->assigned_dev_id;
         match->host_busnr = assigned_dev->busnr;
         match->host_devfn = assigned_dev->devfn;
+        match->flags = assigned_dev->flags;
         match->dev = dev;
         match->irq_source_id = -1;
         match->kvm = kvm;
diff --git a/virt/kvm/vtd.c b/virt/kvm/vtd.c
index 174ea1f8cee5..d46de9af838b 100644
--- a/virt/kvm/vtd.c
+++ b/virt/kvm/vtd.c
@@ -205,22 +205,12 @@ static int kvm_iommu_unmap_memslots(struct kvm *kvm)
 
 int kvm_iommu_unmap_guest(struct kvm *kvm)
 {
-        struct kvm_assigned_dev_kernel *entry;
         struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
 
         /* check if iommu exists and in use */
         if (!domain)
                 return 0;
 
-        list_for_each_entry(entry, &kvm->arch.assigned_dev_head, list) {
-                printk(KERN_DEBUG "VT-d unmap: host bdf = %x:%x:%x\n",
-                       entry->host_busnr,
-                       PCI_SLOT(entry->host_devfn),
-                       PCI_FUNC(entry->host_devfn));
-
-                /* detach kvm dmar domain */
-                intel_iommu_detach_device(domain, entry->dev);
-        }
         kvm_iommu_unmap_memslots(kvm);
         intel_iommu_free_domain(domain);
         return 0;