From patchwork Thu Nov 11 07:46:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 316712 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAB7lNod032167 for ; Thu, 11 Nov 2010 07:47:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757824Ab0KKHrO (ORCPT ); Thu, 11 Nov 2010 02:47:14 -0500 Received: from mga09.intel.com ([134.134.136.24]:31258 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757386Ab0KKHrB (ORCPT ); Thu, 11 Nov 2010 02:47:01 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 10 Nov 2010 23:47:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,181,1288594800"; d="scan'208";a="572448975" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.14]) by orsmga002.jf.intel.com with ESMTP; 10 Nov 2010 23:46:59 -0800 Received: from yasker by syang10-desktop with local (Exim 4.72) (envelope-from ) id 1PGRs6-0001qT-8E; Thu, 11 Nov 2010 15:47:02 +0800 From: Sheng Yang To: Avi Kivity , Marcelo Tosatti , "Michael S. Tsirkin" Cc: kvm@vger.kernel.org, Sheng Yang Subject: [PATCH 5/7] KVM: assigned dev: Clean up assigned_device's flag Date: Thu, 11 Nov 2010 15:46:58 +0800 Message-Id: <1289461620-7055-6-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1289461620-7055-1-git-send-email-sheng@linux.intel.com> References: <1289461620-7055-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 11 Nov 2010 07:47:24 +0000 (UTC) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index e2ecbac..4b31539 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -444,6 +444,7 @@ struct kvm_guest_msix_entry { u16 flags; }; +#define KVM_ASSIGNED_ENABLED_IOMMU (1 << 0) struct kvm_assigned_dev_kernel { struct kvm_irq_ack_notifier ack_notifier; struct work_struct interrupt_work; diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c index 7c98928..5c6b96d 100644 --- a/virt/kvm/assigned-dev.c +++ b/virt/kvm/assigned-dev.c @@ -552,7 +552,8 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, match->host_segnr = assigned_dev->segnr; match->host_busnr = assigned_dev->busnr; match->host_devfn = assigned_dev->devfn; - match->flags = assigned_dev->flags; + if (assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU) + match->flags |= KVM_ASSIGNED_ENABLED_IOMMU; match->dev = dev; spin_lock_init(&match->assigned_dev_lock); match->irq_source_id = -1; @@ -563,7 +564,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, list_add(&match->list, &kvm->arch.assigned_dev_head); - if (assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU) { + if (assigned_dev->flags & KVM_ASSIGNED_ENABLED_IOMMU) { if (!kvm->arch.iommu_domain) { r = kvm_iommu_map_guest(kvm); if (r) @@ -609,7 +610,7 @@ static int kvm_vm_ioctl_deassign_device(struct kvm *kvm, goto out; } - if (match->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU) + if (match->flags & KVM_ASSIGNED_ENABLED_IOMMU) kvm_deassign_device(kvm, match); kvm_free_assigned_device(kvm, match);