From d861150565e48ff6249b2dae38299fb08402bf78 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti <mtosatti@redhat.com> Date: Thu, 21 May 2009 17:08:39 -0700 Subject: [PATCH 01/25] kvm: libkvm: support KVM_ASSIGN_DEV_IRQ and KVM_DEASSIGN_DEV_IRQ ioctls Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Avi Kivity <avi@redhat.com> (cherry picked from commit 19d9a5828697ae0d52e20712e37bcb5b28930f81) Signed-off-by: Chris Wright <chrisw@redhat.com Bugzilla: 498085 Message-Id: <1242950943-30180-2-git-send-email-chrisw@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> RH-Upstream-status: applied Acked-by: Juan Quintela <quintela@redhat.com> Acked-by: Marcelo Tosatti <mtosatti@redhat.com> Acked-by: Don Dutile <ddutile@redhat.com> --- 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 5ffb01f..58e0ce8 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; @@ -1166,6 +1166,42 @@ int kvm_deassign_pci_device(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 int kvm_destroy_memory_region_works(kvm_context_t kvm) diff --git a/libkvm/libkvm.h b/libkvm/libkvm.h index 87dded7..23651e5 100644 --- a/libkvm/libkvm.h +++ b/libkvm/libkvm.h @@ -699,11 +699,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 @@ -711,6 +710,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 * -- 1.6.3.rc4.29.g8146