summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeidong Han <weidong.han@intel.com>2009-04-17 19:40:11 -0300
committerChris Wright <chrisw@sous-sol.org>2009-04-27 10:37:04 -0700
commit18020173f9665487de72c53eca76a1689f2afb48 (patch)
treeb6213c5ae641cd5e20ec3e2679354f8fd4b8597c
parenta6d2078da9aeb83f21277573b240290fa196b5f9 (diff)
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>
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 65c00b34248f..6723411ead55 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);