[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 47/50] ivshmem: rename MSI eventfd_table
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL v2 47/50] ivshmem: rename MSI eventfd_table |
Date: |
Mon, 12 Oct 2015 18:41:41 +0200 |
From: Marc-André Lureau <address@hidden>
The array is used to have vector specific data, so use a more
descriptive name.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
hw/misc/ivshmem.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 3283874..8581d43 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -66,9 +66,9 @@ typedef struct Peer {
EventNotifier *eventfds;
} Peer;
-typedef struct EventfdEntry {
+typedef struct MSIVector {
PCIDevice *pdev;
-} EventfdEntry;
+} MSIVector;
typedef struct IVShmemState {
/*< private >*/
@@ -99,7 +99,7 @@ typedef struct IVShmemState {
int vm_id;
uint32_t vectors;
uint32_t features;
- EventfdEntry *eventfd_table;
+ MSIVector *msi_vectors;
Error *migration_blocker;
@@ -284,10 +284,10 @@ static void ivshmem_event(void *opaque, int event)
static void fake_irqfd(void *opaque, const uint8_t *buf, int size) {
- EventfdEntry *entry = opaque;
+ MSIVector *entry = opaque;
PCIDevice *pdev = entry->pdev;
IVShmemState *s = IVSHMEM(pdev);
- int vector = entry - s->eventfd_table;
+ int vector = entry - s->msi_vectors;
IVSHMEM_DPRINTF("interrupt on vector %p %d\n", pdev, vector);
msix_notify(pdev, vector);
@@ -311,10 +311,10 @@ static CharDriverState* create_eventfd_chr_device(void *
opaque, EventNotifier *
/* if MSI is supported we need multiple interrupts */
if (ivshmem_has_feature(s, IVSHMEM_MSI)) {
- s->eventfd_table[vector].pdev = PCI_DEVICE(s);
+ s->msi_vectors[vector].pdev = PCI_DEVICE(s);
qemu_chr_add_handlers(chr, ivshmem_can_receive, fake_irqfd,
- ivshmem_event, &s->eventfd_table[vector]);
+ ivshmem_event, &s->msi_vectors[vector]);
} else {
qemu_chr_add_handlers(chr, ivshmem_can_receive, ivshmem_receive,
ivshmem_event, s);
@@ -660,7 +660,7 @@ static int ivshmem_setup_msi(IVShmemState * s)
IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors);
/* allocate QEMU char devices for receiving interrupts */
- s->eventfd_table = g_malloc0(s->vectors * sizeof(EventfdEntry));
+ s->msi_vectors = g_malloc0(s->vectors * sizeof(MSIVector));
ivshmem_use_msix(s);
return 0;
@@ -865,7 +865,7 @@ static void pci_ivshmem_exit(PCIDevice *dev)
msix_uninit_exclusive_bar(dev);
}
- g_free(s->eventfd_table);
+ g_free(s->msi_vectors);
}
static bool test_msix(void *opaque, int version_id)
--
2.4.3
- [Qemu-devel] [PULL v2 31/50] ivshmem: reset mask on device reset, (continued)
- [Qemu-devel] [PULL v2 31/50] ivshmem: reset mask on device reset, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 33/50] ivshmem-client: check the number of vectors, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 32/50] contrib: add ivshmem client and server, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 34/50] ivshmem-server: use a uint16 for client ID, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 37/50] ivshmem: add check on protocol version in QEMU, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 38/50] contrib: remove unnecessary strdup(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 40/50] qtest: add qtest_add_abrt_handler(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 41/50] glib-compat: add 2.38/2.40/2.46 asserts, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 42/50] tests: add ivshmem qtest, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 44/50] ivshmem: use qemu_strtosz(), marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 47/50] ivshmem: rename MSI eventfd_table,
marcandre . lureau <=
- [Qemu-devel] [PULL v2 48/50] ivshmem: use kvm irqfd for msi notifications, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 49/50] ivshmem: use little-endian int64_t for the protocol, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 50/50] doc: document ivshmem & hugepages, marcandre . lureau, 2015/10/12
- [Qemu-devel] [PULL v2 39/50] msix: implement pba write (but read-only), marcandre . lureau, 2015/10/12
- Re: [Qemu-devel] [PULL v2 00/50] Ivshmem patches, Peter Maydell, 2015/10/13
- [Qemu-devel] [PULL v2 01/50] tests: Add ivshmem qtest, marcandre . lureau, 2015/10/15