From patchwork Tue Apr 26 13:19:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 732662 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 p3QDK4ax030160 for ; Tue, 26 Apr 2011 13:20:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755483Ab1DZNTv (ORCPT ); Tue, 26 Apr 2011 09:19:51 -0400 Received: from thoth.sbs.de ([192.35.17.2]:29594 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755465Ab1DZNTr (ORCPT ); Tue, 26 Apr 2011 09:19:47 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p3QDJeEr003476; 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 p3QDJepD031993; 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 2/9] qemu-kvm: Rename kvm_msix_message to KVMMsiMessage Date: Tue, 26 Apr 2011 15:19:32 +0200 Message-Id: <34c1e72dbc96d7a3f03f064093d101e2f4cb03b2.1303823975.git.jan.kiszka@siemens.com> 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) This structure will be used for legacy MSI as well and will become part of the KVM API. Signed-off-by: Jan Kiszka --- hw/msix.c | 10 +++++----- hw/pci.h | 10 ++-------- kvm.h | 7 +++++++ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 8b68a6a..42870c5 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -51,7 +51,7 @@ int msix_supported; static void kvm_msix_free(PCIDevice *dev) { int vector, changed = 0; - struct kvm_msix_message *kmm; + KVMMsiMessage *kmm; for (vector = 0; vector < dev->msix_entries_nr; ++vector) { if (dev->msix_entry_used[vector]) { @@ -66,7 +66,7 @@ static void kvm_msix_free(PCIDevice *dev) } static void kvm_msix_message_from_vector(PCIDevice *dev, unsigned vector, - struct kvm_msix_message *kmm) + KVMMsiMessage *kmm) { uint8_t *table_entry = dev->msix_table_page + vector * MSIX_ENTRY_SIZE; @@ -78,7 +78,7 @@ static void kvm_msix_message_from_vector(PCIDevice *dev, unsigned vector, static void kvm_msix_update(PCIDevice *dev, int vector, int was_masked, int is_masked) { - struct kvm_msix_message e = {}, *entry; + KVMMsiMessage e = {}, *entry; int mask_cleared = was_masked && !is_masked; /* It is only legal to change an entry when it is masked. Therefore, it is * enough to update the routing in kernel when mask is being cleared. */ @@ -114,7 +114,7 @@ static void kvm_msix_update(PCIDevice *dev, int vector, static int kvm_msix_add(PCIDevice *dev, unsigned vector) { - struct kvm_msix_message *kmm = dev->msix_irq_entries + vector; + KVMMsiMessage *kmm = dev->msix_irq_entries + vector; int r; if (!kvm_has_gsi_routing()) { @@ -147,7 +147,7 @@ static int kvm_msix_add(PCIDevice *dev, unsigned vector) static void kvm_msix_del(PCIDevice *dev, unsigned vector) { - struct kvm_msix_message *kmm; + KVMMsiMessage *kmm; if (dev->msix_entry_used[vector]) { return; diff --git a/hw/pci.h b/hw/pci.h index dd09494..dc5df17 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -5,6 +5,7 @@ #include "qobject.h" #include "qdev.h" +#include "kvm.h" /* PCI includes legacy ISA access. */ #include "isa.h" @@ -129,13 +130,6 @@ enum { typedef int (*msix_mask_notifier_func)(PCIDevice *, unsigned vector, int masked); -struct kvm_msix_message { - uint32_t gsi; - uint32_t addr_lo; - uint32_t addr_hi; - uint32_t data; -}; - struct PCIDevice { DeviceState qdev; /* PCI config space */ @@ -208,7 +202,7 @@ struct PCIDevice { * on the rest of the region. */ target_phys_addr_t msix_page_size; - struct kvm_msix_message *msix_irq_entries; + KVMMsiMessage *msix_irq_entries; msix_mask_notifier_func msix_mask_notifier; }; diff --git a/kvm.h b/kvm.h index b890b5d..8ece0b3 100644 --- a/kvm.h +++ b/kvm.h @@ -214,6 +214,13 @@ int kvm_set_irqfd(int gsi, int fd, bool assigned) int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign); +typedef struct KVMMsiMessage { + uint32_t gsi; + uint32_t addr_lo; + uint32_t addr_hi; + uint32_t data; +} 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,