From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQY8E-0001rj-DA for qemu-devel@nongnu.org; Tue, 02 Feb 2016 05:24:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQY8B-000655-5w for qemu-devel@nongnu.org; Tue, 02 Feb 2016 05:24:22 -0500 Received: from mx4-phx2.redhat.com ([209.132.183.25]:44593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQY8A-00064z-UW for qemu-devel@nongnu.org; Tue, 02 Feb 2016 05:24:19 -0500 Date: Tue, 2 Feb 2016 05:24:12 -0500 (EST) From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Message-ID: <1255030269.15293079.1454408652071.JavaMail.zimbra@redhat.com> In-Reply-To: <878u33v7bx.fsf@blackfin.pond.sub.org> References: <1454343639-9020-1-git-send-email-marcandre.lureau@redhat.com> <1454343639-9020-7-git-send-email-marcandre.lureau@redhat.com> <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: Markus Armbruster Cc: marcandre lureau , claudio fontana , qemu-devel@nongnu.org Hi ----- Original Message ----- > marcandre.lureau@redhat.com writes: >=20 > > 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 > > -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) { >=20 > Can't happen; s->vectors * sizeof(MSIVector) !=3D 0. It can't happen on allocation failure? > > + return -1; > > + } > > } > > =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 > > - /* 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 > > - ivshmem_use_msix(s); > > return 0; > > } > > =20 > > @@ -947,9 +954,8 @@ static void pci_ivshmem_realize(PCIDevice *dev, Err= or > > **errp) > > IVSHMEM_DPRINTF("using shared memory server (socket =3D %s)\n"= , > > s->server_chr->filename); > > =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; > > } >=20 > With the useless conditional dropped: > Reviewed-by: Markus Armbruster >=20