From: Weidong Han <weidong.han@intel.com>
Date: Fri, 17 Apr 2009 22:40:11 +0000 (-0300)
Subject: KVM: fix kvm_vm_ioctl_deassign_device
X-Git-Tag: v2.6.29.2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18020173f9665487de72c53eca76a1689f2afb48;p=thirdparty%2Fkernel%2Fstable.git

KVM: fix kvm_vm_ioctl_deassign_device

upstream commit: 4a906e49f103c2e544148a209ba1db316510799f

only need to set assigned_dev_id for deassignment, use
match->flags to judge and deassign it.

Acked-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Weidong Han <weidong.han@intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 65c00b34248fd..6723411ead550 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -563,7 +563,7 @@ static int kvm_vm_ioctl_deassign_device(struct kvm *kvm,
 		goto out;
 	}
 
-	if (assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU)
+	if (match->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU)
 		kvm_deassign_device(kvm, match);
 
 	kvm_free_assigned_device(kvm, match);