[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/8] ivshmem: generalize ivshmem_setup_interrupts
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH 6/8] ivshmem: generalize ivshmem_setup_interrupts |
Date: |
Mon, 21 Dec 2015 12:30:42 +0100 |
From: Marc-André Lureau <address@hidden>
Call ivshmem_setup_interrupts() with or without MSI, always allocate
msi_vectors that is going to be used in all case in the following patch.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/misc/ivshmem.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index dcfc8cc..11780b1 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -768,19 +768,28 @@ static void ivshmem_reset(DeviceState *d)
ivshmem_use_msix(s);
}
-static int ivshmem_setup_msi(IVShmemState * s)
+static int ivshmem_setup_interrupts(IVShmemState *s, Error **errp)
{
- if (msix_init_exclusive_bar(PCI_DEVICE(s), s->vectors, 1)) {
- return -1;
+ /* allocate QEMU callback data for receiving interrupts */
+ s->msi_vectors = g_malloc0(s->vectors * sizeof(MSIVector));
+ if (!s->msi_vectors) {
+ goto fail;
}
- IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors);
+ if (ivshmem_has_feature(s, IVSHMEM_MSI)) {
+ if (msix_init_exclusive_bar(PCI_DEVICE(s), s->vectors, 1)) {
+ goto fail;
+ }
- /* allocate QEMU char devices for receiving interrupts */
- s->msi_vectors = g_malloc0(s->vectors * sizeof(MSIVector));
+ IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors);
+ ivshmem_use_msix(s);
+ }
- ivshmem_use_msix(s);
return 0;
+
+fail:
+ error_setg(errp, "failed to initialize interrupts");
+ return -1;
}
static void ivshmem_enable_irqfd(IVShmemState *s)
@@ -946,9 +955,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
**errp)
IVSHMEM_DPRINTF("using shared memory server (socket = %s)\n",
s->server_chr->filename);
- if (ivshmem_has_feature(s, IVSHMEM_MSI) &&
- ivshmem_setup_msi(s)) {
- error_setg(errp, "msix initialization failed");
+ if (ivshmem_setup_interrupts(s, errp) < 0) {
return;
}
--
2.5.0
- [Qemu-devel] [PATCH 0/8] ivshmem: test msi=off, remove CharDriver, marcandre . lureau, 2015/12/21
- [Qemu-devel] [PATCH 1/8] ivshmem: no need for opaque argument, marcandre . lureau, 2015/12/21
- [Qemu-devel] [PATCH 2/8] ivshmem: remove redundant assignment, fix crash with msi=off, marcandre . lureau, 2015/12/21
- [Qemu-devel] [PATCH 4/8] libqos: remove some leaks, marcandre . lureau, 2015/12/21
- [Qemu-devel] [PATCH 5/8] ivshmem-test: test both msi & irq cases, marcandre . lureau, 2015/12/21
- [Qemu-devel] [PATCH 3/8] ivshmem-test: leak fixes, marcandre . lureau, 2015/12/21
- [Qemu-devel] [PATCH 6/8] ivshmem: generalize ivshmem_setup_interrupts,
marcandre . lureau <=
- [Qemu-devel] [PATCH 8/8] char: remove qemu_chr_open_eventfd, marcandre . lureau, 2015/12/21
- [Qemu-devel] [PATCH 7/8] ivshmem: use a single eventfd callback, get rid of CharDriver, marcandre . lureau, 2015/12/21