From: Markus Armbruster <armbru@redhat.com>
To: marcandre.lureau@redhat.com
Cc: claudio.fontana@huawei.com, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2 6/8] ivshmem: generalize ivshmem_setup_interrupts
Date: Tue, 02 Feb 2016 09:34:42 +0100 [thread overview]
Message-ID: <878u33v7bx.fsf@blackfin.pond.sub.org> (raw)
In-Reply-To: <1454343639-9020-7-git-send-email-marcandre.lureau@redhat.com> (marcandre lureau's message of "Mon, 1 Feb 2016 17:20:37 +0100")
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> 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 <marcandre.lureau@redhat.com>
> ---
> hw/misc/ivshmem.c | 26 ++++++++++++++++----------
> 1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
> index 5029789..c601a8a 100644
> --- a/hw/misc/ivshmem.c
> +++ b/hw/misc/ivshmem.c
> @@ -769,18 +769,25 @@ static void ivshmem_reset(DeviceState *d)
> ivshmem_use_msix(s);
> }
>
> -static int ivshmem_setup_msi(IVShmemState * s)
> +static int ivshmem_setup_interrupts(IVShmemState *s)
> {
> - if (msix_init_exclusive_bar(PCI_DEVICE(s), s->vectors, 1)) {
> - return -1;
> + /* allocate QEMU callback data for receiving interrupts */
> + if (s->vectors > 0) {
> + s->msi_vectors = g_malloc0(s->vectors * sizeof(MSIVector));
> + if (!s->msi_vectors) {
Can't happen; s->vectors * sizeof(MSIVector) != 0.
> + return -1;
> + }
> }
>
> - 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)) {
> + return -1;
> + }
>
> - /* 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;
> }
>
> @@ -947,9 +954,8 @@ 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) < 0) {
> + error_setg(errp, "failed to initialize interrupts");
> return;
> }
With the useless conditional dropped:
Reviewed-by: Markus Armbruster <armbru@redhat.com>
next prev parent reply other threads:[~2016-02-02 8:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-01 16:20 [Qemu-devel] [PATCH v2 0/8] ivshmem: test msi=off, fix regressions, remove CharDriver marcandre.lureau
2016-02-01 16:20 ` [Qemu-devel] [PATCH v2 1/8] ivshmem: no need for opaque argument marcandre.lureau
2016-02-02 8:33 ` Markus Armbruster
2016-02-01 16:20 ` [Qemu-devel] [PATCH v2 2/8] ivshmem: remove redundant assignment, fix crash with msi=off marcandre.lureau
2016-02-01 16:20 ` [Qemu-devel] [PATCH v2 3/8] ivshmem-test: leak fixes marcandre.lureau
2016-02-02 8:34 ` Markus Armbruster
2016-02-01 16:20 ` [Qemu-devel] [PATCH v2 4/8] libqos: remove some leaks marcandre.lureau
2016-02-02 8:34 ` Markus Armbruster
2016-02-01 16:20 ` [Qemu-devel] [PATCH v2 5/8] ivshmem-test: test both msi & irq cases marcandre.lureau
2016-02-02 8:34 ` Markus Armbruster
2016-02-01 16:20 ` [Qemu-devel] [PATCH v2 6/8] ivshmem: generalize ivshmem_setup_interrupts marcandre.lureau
2016-02-02 8:34 ` Markus Armbruster [this message]
2016-02-02 10:24 ` Marc-André Lureau
2016-02-02 11:53 ` Markus Armbruster
2016-02-02 11:55 ` Marc-André Lureau
2016-02-01 16:20 ` [Qemu-devel] [PATCH v2 7/8] ivshmem: use a single eventfd callback, get rid of CharDriver marcandre.lureau
2016-02-02 8:34 ` Markus Armbruster
2016-02-01 16:20 ` [Qemu-devel] [PATCH v2 8/8] char: remove qemu_chr_open_eventfd marcandre.lureau
2016-02-02 8:35 ` Markus Armbruster
2016-02-02 8:37 ` [Qemu-devel] [PATCH v2 0/8] ivshmem: test msi=off, fix regressions, remove CharDriver Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878u33v7bx.fsf@blackfin.pond.sub.org \
--to=armbru@redhat.com \
--cc=claudio.fontana@huawei.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.