From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 1/4] KVM: support VT-d device hotplug Date: Sun, 16 Nov 2008 10:05:46 +0200 Message-ID: <491FD45A.9070309@redhat.com> References: <715D42877B251141A38726ABF5CABF2C018BE64962@pdsmsx503.ccr.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: "kvm@vger.kernel.org" , "Kay, Allen M" , "Yang, Sheng" To: "Han, Weidong" Return-path: Received: from mx2.redhat.com ([66.187.237.31]:46759 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751652AbYKPIFw (ORCPT ); Sun, 16 Nov 2008 03:05:52 -0500 In-Reply-To: <715D42877B251141A38726ABF5CABF2C018BE64962@pdsmsx503.ccr.corp.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: Han, Weidong wrote: > From bba614bf2acf22f765995fb2364de04cec039226 Mon Sep 17 00:00:00 2001 > From: Weidong Han > Date: Fri, 14 Nov 2008 16:53:10 +0800 > Subject: [PATCH] support VT-d device hotplug > > wrap kvm_assign_device() and kvm_deassign_device() to support assign/deassign a device to a guest > > --- a/include/linux/kvm.h > +++ b/include/linux/kvm.h > @@ -425,6 +425,8 @@ struct kvm_trace_rec { > struct kvm_assigned_pci_dev) > #define KVM_ASSIGN_IRQ _IOR(KVMIO, 0x70, \ > struct kvm_assigned_irq) > +#define KVM_DEASSIGN_PCI_DEVICE _IOR(KVMIO, 0x71, \ > + struct kvm_assigned_pci_dev) > > Need a KVM_CAP_ to indicate this is available. > > static inline void kvm_guest_enter(void) > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 4f43abe..689d615 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -293,7 +293,11 @@ 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) { > - r = kvm_iommu_map_guest(kvm, match); > + if (kvm->arch.intel_iommu_domain) > + r = kvm_assign_device(kvm, match); > + else > + r = kvm_iommu_map_guest(kvm, match); > + > Shouldn't kvm_assign_device() be called unconditionally? Perhaps some code needs to be removed from kvm_iommu_map_guest(). -- error compiling committee.c: too many arguments to function