From patchwork Mon Oct 17 09:28:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 120173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AB7F6B6FA2 for ; Mon, 17 Oct 2011 22:26:23 +1100 (EST) Received: from localhost ([::1]:53091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjWO-0000GY-Dp for incoming@patchwork.ozlabs.org; Mon, 17 Oct 2011 05:30:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjUs-0005JU-Lc for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFjUk-0004L1-V3 for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:38 -0400 Received: from thoth.sbs.de ([192.35.17.2]:20444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjUk-0004KU-HJ for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:30 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p9H9ST48021386; Mon, 17 Oct 2011 11:28:29 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p9H9SKVl023511; Mon, 17 Oct 2011 11:28:29 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 17 Oct 2011 11:28:05 +0200 Message-Id: <8cff41e91be4d4cca75dc2eabb5afaa5b2d0575d.1318843693.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: Alex Williamson , qemu-devel@nongnu.org, kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [RFC][PATCH 31/45] qemu-kvm: Refactor kvm_deassign_irq to kvm_device_irq_deassign X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Don't pass kvm_assigned_irq struct, rather use the actually required fields in the interface. Signed-off-by: Jan Kiszka --- hw/device-assignment.c | 42 ++++++++++++++++++++++++------------------ qemu-kvm.c | 15 ++++++++++----- qemu-kvm.h | 11 +---------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 4e4349b..e0b9cfe 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -810,7 +810,8 @@ static int assign_device(AssignedDevice *dev) static int assign_intx(AssignedDevice *dev) { struct kvm_assigned_irq assigned_irq_data; - int irq, r = 0; + uint32_t dev_id; + int irq, r; /* Interrupt PIN 0 means don't use INTx */ if (assigned_dev_pci_read_byte(&dev->dev, PCI_INTERRUPT_PIN) == 0) @@ -819,21 +820,24 @@ static int assign_intx(AssignedDevice *dev) irq = pci_map_irq(&dev->dev, dev->intpin); irq = piix_get_irq(irq); - if (dev->girq == irq) - return r; + if (dev->girq == irq) { + return 0; + } + + dev_id = calc_assigned_dev_id(dev); - memset(&assigned_irq_data, 0, sizeof(assigned_irq_data)); - assigned_irq_data.assigned_dev_id = calc_assigned_dev_id(dev); - assigned_irq_data.guest_irq = irq; if (dev->irq_requested_type) { - assigned_irq_data.flags = dev->irq_requested_type; - r = kvm_deassign_irq(kvm_state, &assigned_irq_data); + r = kvm_device_irq_deassign(kvm_state, dev_id, + dev->irq_requested_type); if (r) { perror("assign_intx: deassign"); } dev->irq_requested_type = 0; } + memset(&assigned_irq_data, 0, sizeof(assigned_irq_data)); + assigned_irq_data.assigned_dev_id = dev_id; + assigned_irq_data.guest_irq = irq; assigned_irq_data.flags = KVM_DEV_IRQ_GUEST_INTX; if (dev->features & ASSIGNED_DEVICE_PREFER_MSI_MASK && dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) @@ -913,20 +917,19 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev) AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev); uint8_t ctrl_byte = pci_get_byte(pci_dev->config + pci_dev->msi_cap + PCI_MSI_FLAGS); + uint32_t dev_id; int r; - memset(&assigned_irq_data, 0, sizeof assigned_irq_data); - assigned_irq_data.assigned_dev_id = calc_assigned_dev_id(assigned_dev); + dev_id = calc_assigned_dev_id(assigned_dev); /* Some guests gratuitously disable MSI even if they're not using it, * try to catch this by only deassigning irqs if the guest is using * MSI or intends to start. */ if ((assigned_dev->irq_requested_type & KVM_DEV_IRQ_GUEST_MSI) || (ctrl_byte & PCI_MSI_FLAGS_ENABLE)) { - - assigned_irq_data.flags = assigned_dev->irq_requested_type; free_dev_irq_entries(assigned_dev); - r = kvm_deassign_irq(kvm_state, &assigned_irq_data); + r = kvm_device_irq_deassign(kvm_state, dev_id, + assigned_dev->irq_requested_type); /* -ENXIO means no assigned irq */ if (r && r != -ENXIO) perror("assigned_dev_update_msi: deassign irq"); @@ -958,6 +961,8 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev) } assigned_dev->irq_entries_nr = 1; + memset(&assigned_irq_data, 0, sizeof assigned_irq_data); + assigned_irq_data.assigned_dev_id = dev_id; assigned_irq_data.guest_irq = assigned_dev->entry->gsi; assigned_irq_data.flags = KVM_DEV_IRQ_HOST_MSI | KVM_DEV_IRQ_GUEST_MSI; if (kvm_assign_irq(kvm_state, &assigned_irq_data) < 0) { @@ -1066,20 +1071,19 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev) AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev); uint16_t ctrl_word = pci_get_word(pci_dev->config + pci_dev->msix_cap + PCI_MSIX_FLAGS); + uint32_t dev_id; int r; - memset(&assigned_irq_data, 0, sizeof assigned_irq_data); - assigned_irq_data.assigned_dev_id = calc_assigned_dev_id(assigned_dev); + dev_id = calc_assigned_dev_id(assigned_dev); /* Some guests gratuitously disable MSIX even if they're not using it, * try to catch this by only deassigning irqs if the guest is using * MSIX or intends to start. */ if ((assigned_dev->irq_requested_type & KVM_DEV_IRQ_GUEST_MSIX) || (ctrl_word & PCI_MSIX_FLAGS_ENABLE)) { - - assigned_irq_data.flags = assigned_dev->irq_requested_type; free_dev_irq_entries(assigned_dev); - r = kvm_deassign_irq(kvm_state, &assigned_irq_data); + r = kvm_device_irq_deassign(kvm_state, dev_id, + assigned_dev->irq_requested_type); /* -ENXIO means no assigned irq */ if (r && r != -ENXIO) perror("assigned_dev_update_msix: deassign irq"); @@ -1088,6 +1092,8 @@ static void assigned_dev_update_msix(PCIDevice *pci_dev) } if (ctrl_word & PCI_MSIX_FLAGS_ENABLE) { + memset(&assigned_irq_data, 0, sizeof assigned_irq_data); + assigned_irq_data.assigned_dev_id = dev_id; assigned_irq_data.flags = KVM_DEV_IRQ_HOST_MSIX | KVM_DEV_IRQ_GUEST_MSIX; diff --git a/qemu-kvm.c b/qemu-kvm.c index 199564c..c24e93c 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -206,11 +206,6 @@ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq) return kvm_old_assign_irq(s, assigned_irq); } - -int kvm_deassign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq) -{ - return kvm_vm_ioctl(s, KVM_DEASSIGN_DEV_IRQ, assigned_irq); -} #else int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq) { @@ -219,6 +214,16 @@ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_irq) #endif #endif +int kvm_device_irq_deassign(KVMState *s, uint32_t dev_id, uint32_t type) +{ + struct kvm_assigned_irq assigned_irq = { + .assigned_dev_id = dev_id, + .flags = type, + }; + + return kvm_vm_ioctl(s, KVM_DEASSIGN_DEV_IRQ, &assigned_irq); +} + #ifdef KVM_CAP_DEVICE_DEASSIGNMENT int kvm_deassign_pci_device(KVMState *s, struct kvm_assigned_pci_dev *assigned_dev) diff --git a/qemu-kvm.h b/qemu-kvm.h index b2ae5da..7cdb5a8 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -150,16 +150,7 @@ int kvm_assign_pci_device(KVMState *s, */ int kvm_assign_irq(KVMState *s, struct kvm_assigned_irq *assigned_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(KVMState *s, struct kvm_assigned_irq *assigned_irq); +int kvm_device_irq_deassign(KVMState *s, uint32_t dev_id, uint32_t type); /*! * \brief Notifies host kernel about a PCI device to be deassigned from a guest