From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQaJB-00054k-Cs for qemu-devel@nongnu.org; Tue, 02 Feb 2016 07:43:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQaJA-00020F-Gp for qemu-devel@nongnu.org; Tue, 02 Feb 2016 07:43:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQaJA-00020B-CR for qemu-devel@nongnu.org; Tue, 02 Feb 2016 07:43:48 -0500 From: marcandre.lureau@redhat.com Date: Tue, 2 Feb 2016 13:43:34 +0100 Message-Id: <1454417016-3913-7-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1454417016-3913-1-git-send-email-marcandre.lureau@redhat.com> References: <1454417016-3913-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 6/8] ivshmem: generalize ivshmem_setup_interrupts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: claudio.fontana@huawei.com, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 Reviewed-by: Markus Armbruster --- hw/misc/ivshmem.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 5029789..5f33149 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -769,18 +769,20 @@ 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 */ + s->msi_vectors =3D g_malloc0(s->vectors * sizeof(MSIVector)); =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 +949,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 - 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 --=20 2.5.0