From patchwork Wed Feb 18 07:12:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Han, Weidong" X-Patchwork-Id: 7708 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1I7CUIu031506 for ; Wed, 18 Feb 2009 07:12:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751078AbZBRHM2 (ORCPT ); Wed, 18 Feb 2009 02:12:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752791AbZBRHM2 (ORCPT ); Wed, 18 Feb 2009 02:12:28 -0500 Received: from mga11.intel.com ([192.55.52.93]:10917 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752722AbZBRHM2 (ORCPT ); Wed, 18 Feb 2009 02:12:28 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 17 Feb 2009 23:10:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,227,1233561600"; d="scan'208,223";a="431876299" Received: from azsmsx602.amr.corp.intel.com ([10.2.121.201]) by fmsmga002.fm.intel.com with ESMTP; 17 Feb 2009 23:08:27 -0800 Received: from pdsmsx602.ccr.corp.intel.com (172.16.12.184) by azsmsx602.amr.corp.intel.com (10.2.121.201) with Microsoft SMTP Server (TLS) id 8.1.311.2; Wed, 18 Feb 2009 00:12:27 -0700 Received: from pdsmsx503.ccr.corp.intel.com ([172.16.12.95]) by pdsmsx602.ccr.corp.intel.com ([172.16.12.184]) with mapi; Wed, 18 Feb 2009 15:12:25 +0800 From: "Han, Weidong" To: "'Avi Kivity'" CC: "'kvm@vger.kernel.org'" , "'Mark McLoughlin'" , "'Marcelo Tosatti'" Date: Wed, 18 Feb 2009 15:12:23 +0800 Subject: [PATCH 2/8] kvm: fix kvm_vm_ioctl_deassign_device Thread-Topic: [PATCH 2/8] kvm: fix kvm_vm_ioctl_deassign_device Thread-Index: AcmRmD7JdRdnYPB3QqylpATgJyMQSA== Message-ID: <715D42877B251141A38726ABF5CABF2C0195A1F9B1@pdsmsx503.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 --- virt/kvm/kvm_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index ef52622..3aacdb9 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -574,7 +574,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);