Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760085AbZDWH4g (ORCPT ); Thu, 23 Apr 2009 03:56:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757216AbZDWHeR (ORCPT ); Thu, 23 Apr 2009 03:34:17 -0400 Received: from sous-sol.org ([216.99.217.87]:51046 "EHLO x200.localdomain" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756669AbZDWHeP (ORCPT ); Thu, 23 Apr 2009 03:34:15 -0400 Message-Id: <20090423073012.859243905@sous-sol.org> User-Agent: quilt/0.47-1 Date: Thu, 23 Apr 2009 00:21:47 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org, chrisw@redhat.com Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, mtosatti@redhat.com, Weidong Han , Avi Kivity , Mark McLoughlin Subject: [patch 087/100] KVM: fix kvm_vm_ioctl_deassign_device References: <20090423072020.428683652@sous-sol.org> Content-Disposition: inline; filename=kvm-fix-kvm_vm_ioctl_deassign_device.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1129 Lines: 35 -stable review patch. If anyone has any objections, please let us know. --------------------- From: Weidong Han upstream commit: 4a906e49f103c2e544148a209ba1db316510799f only need to set assigned_dev_id for deassignment, use match->flags to judge and deassign it. Acked-by: Mark McLoughlin Signed-off-by: Weidong Han Signed-off-by: Avi Kivity Signed-off-by: Chris Wright --- virt/kvm/kvm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -563,7 +563,7 @@ static int kvm_vm_ioctl_deassign_device( 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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/