[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 6/8] ivshmem: generalize ivshmem_setup_interrupt
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 6/8] ivshmem: generalize ivshmem_setup_interrupts |
Date: |
Fri, 29 Jan 2016 16:59:45 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
address@hidden writes:
> 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) {
Happens exactly when s->vectors is zero. Is that a legitimate
configuration?
> + 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;
> }
Recommend not to move the error_setg(). Keeps this function simpler, at
no cost.
>
> 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;
> }
Yup, the only change is we now allocate s->msi_vectors whether we have
IVSHMEM_MSI or not.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH 6/8] ivshmem: generalize ivshmem_setup_interrupts,
Markus Armbruster <=