From patchwork Mon Mar 16 09:14:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 12341 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 n2G9F9fq015089 for ; Mon, 16 Mar 2009 09:15:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753492AbZCPJOO (ORCPT ); Mon, 16 Mar 2009 05:14:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753564AbZCPJOO (ORCPT ); Mon, 16 Mar 2009 05:14:14 -0400 Received: from mga02.intel.com ([134.134.136.20]:19773 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753135AbZCPJON (ORCPT ); Mon, 16 Mar 2009 05:14:13 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 16 Mar 2009 02:07:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,372,1233561600"; d="scan'208";a="394801225" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.189]) by orsmga002.jf.intel.com with ESMTP; 16 Mar 2009 02:22:35 -0700 Received: from yasker by syang10-desktop with local (Exim 4.69) (envelope-from ) id 1Lj8tZ-0005nZ-4b; Mon, 16 Mar 2009 17:14:05 +0800 From: Sheng Yang To: Avi Kivity , Anthony Liguori Cc: kvm@vger.kernel.org, Marcelo Tosatti , Sheng Yang Subject: [PATCH 01/16] kvm: ioctl for KVM_ASSIGN_DEV_IRQ and KVM_DEASSIGN_DEV_IRQ Date: Mon, 16 Mar 2009 17:14:05 +0800 Message-Id: <1237194845-22271-1-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <200903161711.59050.sheng@linux.intel.com> References: <200903161711.59050.sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Marcelo Tosatti Signed-off-by: Marcelo Tosatti Signed-off-by: Sheng Yang --- libkvm/libkvm.c | 38 +++++++++++++++++++++++++++++++++++++- libkvm/libkvm.h | 21 +++++++++++++++++---- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c index 0ac1c28..80a0481 100644 --- a/libkvm/libkvm.c +++ b/libkvm/libkvm.c @@ -1141,7 +1141,7 @@ int kvm_assign_pci_device(kvm_context_t kvm, return ret; } -int kvm_assign_irq(kvm_context_t kvm, +static int kvm_old_assign_irq(kvm_context_t kvm, struct kvm_assigned_irq *assigned_irq) { int ret; @@ -1152,6 +1152,42 @@ int kvm_assign_irq(kvm_context_t kvm, return ret; } + +#ifdef KVM_CAP_ASSIGN_DEV_IRQ +int kvm_assign_irq(kvm_context_t kvm, + struct kvm_assigned_irq *assigned_irq) +{ + int ret; + + ret = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_ASSIGN_DEV_IRQ); + if (ret > 0) { + ret = ioctl(kvm->vm_fd, KVM_ASSIGN_DEV_IRQ, assigned_irq); + if (ret < 0) + return -errno; + return ret; + } + + return kvm_old_assign_irq(kvm, assigned_irq); +} + +int kvm_deassign_irq(kvm_context_t kvm, + struct kvm_assigned_irq *assigned_irq) +{ + int ret; + + ret = ioctl(kvm->vm_fd, KVM_DEASSIGN_DEV_IRQ, assigned_irq); + if (ret < 0) + return -errno; + + return ret; +} +#else +int kvm_assign_irq(kvm_context_t kvm, + struct kvm_assigned_irq *assigned_irq) +{ + return kvm_old_assign_irq(kvm, assigned_irq); +} +#endif #endif #ifdef KVM_CAP_DEVICE_DEASSIGNMENT diff --git a/libkvm/libkvm.h b/libkvm/libkvm.h index 0239cb6..3e5efe0 100644 --- a/libkvm/libkvm.h +++ b/libkvm/libkvm.h @@ -715,11 +715,10 @@ int kvm_assign_pci_device(kvm_context_t kvm, struct kvm_assigned_pci_dev *assigned_dev); /*! - * \brief Notifies host kernel about changes to IRQ for an assigned device + * \brief Assign IRQ for an assigned device * - * Used for PCI device assignment, this function notifies the host - * kernel about the changes in IRQ number for an assigned physical - * PCI device. + * Used for PCI device assignment, this function assigns IRQ numbers for + * an physical device and guest IRQ handling. * * \param kvm Pointer to the current kvm_context * \param assigned_irq Parameters, like dev id, host irq, guest irq, etc @@ -727,6 +726,20 @@ int kvm_assign_pci_device(kvm_context_t kvm, int kvm_assign_irq(kvm_context_t kvm, struct kvm_assigned_irq *assigned_irq); +#ifdef KVM_CAP_ASSIGN_DEV_IRQ +/*! + * \brief Deassign IRQ for an assigned device + * + * Used for PCI device assignment, this function deassigns IRQ numbers + * for an assigned device. + * + * \param kvm Pointer to the current kvm_context + * \param assigned_irq Parameters, like dev id, host irq, guest irq, etc + */ +int kvm_deassign_irq(kvm_context_t kvm, + struct kvm_assigned_irq *assigned_irq); +#endif + /*! * \brief Determines whether destroying memory regions is allowed *