From patchwork Tue Apr 26 13:19:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 732642 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 p3QDK4av030160 for ; Tue, 26 Apr 2011 13:20:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755462Ab1DZNTt (ORCPT ); Tue, 26 Apr 2011 09:19:49 -0400 Received: from david.siemens.de ([192.35.17.14]:34549 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755464Ab1DZNTq (ORCPT ); Tue, 26 Apr 2011 09:19:46 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p3QDJeip026377; Tue, 26 Apr 2011 15:19:41 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p3QDJepE031993; Tue, 26 Apr 2011 15:19:40 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [PATCH v2 3/9] qemu-kvm: Refactor MSI core API of KVM Date: Tue, 26 Apr 2011 15:19:33 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 26 Apr 2011 13:20:04 +0000 (UTC) Remove MSI-X from function names - the interface is valid for MSI as well - and use KVMMsiMessage as parameter. Signed-off-by: Jan Kiszka --- hw/msix.c | 15 ++++----------- kvm.h | 13 +++++-------- qemu-kvm.c | 32 +++++++++++++------------------- 3 files changed, 22 insertions(+), 38 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 42870c5..52facd4 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -51,12 +51,10 @@ int msix_supported; static void kvm_msix_free(PCIDevice *dev) { int vector, changed = 0; - KVMMsiMessage *kmm; for (vector = 0; vector < dev->msix_entries_nr; ++vector) { if (dev->msix_entry_used[vector]) { - kmm = &dev->msix_irq_entries[vector]; - kvm_del_msix(kmm->gsi, kmm->addr_lo, kmm->addr_hi, kmm->data); + kvm_msi_message_del(&dev->msix_irq_entries[vector]); changed = 1; } } @@ -94,9 +92,7 @@ static void kvm_msix_update(PCIDevice *dev, int vector, if (memcmp(entry, &e, sizeof e) != 0) { int r; - r = kvm_update_msix(entry->gsi, entry->addr_lo, - entry->addr_hi, entry->data, - e.gsi, e.addr_lo, e.addr_hi, e.data); + r = kvm_msi_message_update(entry, &e); if (r) { fprintf(stderr, "%s: kvm_update_msix failed: %s\n", __func__, strerror(-r)); @@ -131,7 +127,7 @@ static int kvm_msix_add(PCIDevice *dev, unsigned vector) } kmm->gsi = r; kvm_msix_message_from_vector(dev, vector, kmm); - r = kvm_add_msix(kmm->gsi, kmm->addr_lo, kmm->addr_hi, kmm->data); + r = kvm_msi_message_add(kmm); if (r < 0) { fprintf(stderr, "%s: kvm_add_msix failed: %s\n", __func__, strerror(-r)); return r; @@ -147,13 +143,10 @@ static int kvm_msix_add(PCIDevice *dev, unsigned vector) static void kvm_msix_del(PCIDevice *dev, unsigned vector) { - KVMMsiMessage *kmm; - if (dev->msix_entry_used[vector]) { return; } - kmm = &dev->msix_irq_entries[vector]; - kvm_del_msix(kmm->gsi, kmm->addr_lo, kmm->addr_hi, kmm->data); + kvm_msi_message_del(&dev->msix_irq_entries[vector]); kvm_commit_irq_routes(); } diff --git a/kvm.h b/kvm.h index 8ece0b3..179eb7e 100644 --- a/kvm.h +++ b/kvm.h @@ -223,14 +223,11 @@ typedef struct KVMMsiMessage { int kvm_has_gsi_routing(void); int kvm_get_irq_route_gsi(void); -int kvm_add_msix(uint32_t gsi, uint32_t addr_lo, - uint32_t addr_hi, uint32_t data); -int kvm_del_msix(uint32_t gsi, uint32_t addr_lo, - uint32_t addr_hi, uint32_t data); -int kvm_update_msix(uint32_t old_gsi, uint32_t old_addr_lo, - uint32_t old_addr_hi, uint32_t old_data, - uint32_t new_gsi, uint32_t new_addr_lo, - uint32_t new_addr_hi, uint32_t new_data); + +int kvm_msi_message_add(KVMMsiMessage *msg); +int kvm_msi_message_del(KVMMsiMessage *msg); +int kvm_msi_message_update(KVMMsiMessage *old, KVMMsiMessage *new); + int kvm_commit_irq_routes(void); int kvm_irqchip_in_kernel(void); diff --git a/qemu-kvm.c b/qemu-kvm.c index 7689225..9cbc109 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -969,46 +969,40 @@ int kvm_get_irq_route_gsi(void) return -ENOSPC; } -static void kvm_msix_routing_entry(struct kvm_irq_routing_entry *e, - uint32_t gsi, uint32_t addr_lo, - uint32_t addr_hi, uint32_t data) +static void kvm_msi_routing_entry(struct kvm_irq_routing_entry *e, + KVMMsiMessage *msg) { - e->gsi = gsi; + e->gsi = msg->gsi; e->type = KVM_IRQ_ROUTING_MSI; e->flags = 0; - e->u.msi.address_lo = addr_lo; - e->u.msi.address_hi = addr_hi; - e->u.msi.data = data; + e->u.msi.address_lo = msg->addr_lo; + e->u.msi.address_hi = msg->addr_hi; + e->u.msi.data = msg->data; } -int kvm_add_msix(uint32_t gsi, uint32_t addr_lo, - uint32_t addr_hi, uint32_t data) +int kvm_msi_message_add(KVMMsiMessage *msg) { struct kvm_irq_routing_entry e; - kvm_msix_routing_entry(&e, gsi, addr_lo, addr_hi, data); + kvm_msi_routing_entry(&e, msg); return kvm_add_routing_entry(&e); } -int kvm_del_msix(uint32_t gsi, uint32_t addr_lo, - uint32_t addr_hi, uint32_t data) +int kvm_msi_message_del(KVMMsiMessage *msg) { struct kvm_irq_routing_entry e; - kvm_msix_routing_entry(&e, gsi, addr_lo, addr_hi, data); + kvm_msi_routing_entry(&e, msg); return kvm_del_routing_entry(&e); } -int kvm_update_msix(uint32_t old_gsi, uint32_t old_addr_lo, - uint32_t old_addr_hi, uint32_t old_data, - uint32_t new_gsi, uint32_t new_addr_lo, - uint32_t new_addr_hi, uint32_t new_data) +int kvm_msi_message_update(KVMMsiMessage *old, KVMMsiMessage *new) { struct kvm_irq_routing_entry e1, e2; - kvm_msix_routing_entry(&e1, old_gsi, old_addr_lo, old_addr_hi, old_data); - kvm_msix_routing_entry(&e2, new_gsi, new_addr_lo, new_addr_hi, new_data); + kvm_msi_routing_entry(&e1, old); + kvm_msi_routing_entry(&e2, new); return kvm_update_routing_entry(&e1, &e2); }