From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQWQA-00014I-RY for qemu-devel@nongnu.org; Tue, 02 Feb 2016 03:34:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQWQ9-0001X3-5a for qemu-devel@nongnu.org; Tue, 02 Feb 2016 03:34:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQWQ9-0001Wz-0C for qemu-devel@nongnu.org; Tue, 02 Feb 2016 03:34:45 -0500 From: Markus Armbruster References: <1454343639-9020-1-git-send-email-marcandre.lureau@redhat.com> <1454343639-9020-7-git-send-email-marcandre.lureau@redhat.com> Date: Tue, 02 Feb 2016 09:34:42 +0100 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") Message-ID: <878u33v7bx.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 6/8] ivshmem: generalize ivshmem_setup_interrupts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com Cc: claudio.fontana@huawei.com, qemu-devel@nongnu.org marcandre.lureau@redhat.com writes: > From: Marc-Andr=C3=A9 Lureau > > 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=C3=A9 Lureau > --- > 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); > } >=20=20 > -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 =3D g_malloc0(s->vectors * sizeof(MSIVector)); > + if (!s->msi_vectors) { Can't happen; s->vectors * sizeof(MSIVector) !=3D 0. > + return -1; > + } > } >=20=20 > - 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; > + } >=20=20 > - /* allocate QEMU char devices for receiving interrupts */ > - s->msi_vectors =3D g_malloc0(s->vectors * sizeof(MSIVector)); > + IVSHMEM_DPRINTF("msix initialized (%d vectors)\n", s->vectors); > + ivshmem_use_msix(s); > + } >=20=20 > - ivshmem_use_msix(s); > return 0; > } >=20=20 > @@ -947,9 +954,8 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) > IVSHMEM_DPRINTF("using shared memory server (socket =3D %s)\n", > s->server_chr->filename); >=20=20 > - 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