From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44692) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad0n7-00045b-Ui for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ad0n5-0003wT-5q for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad0n5-0003vI-0n for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:03 -0500 From: Markus Armbruster Date: Mon, 7 Mar 2016 20:25:31 +0100 Message-Id: <1457378754-21649-20-git-send-email-armbru@redhat.com> In-Reply-To: <1457378754-21649-1-git-send-email-armbru@redhat.com> References: <1457378754-21649-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 19/42] ivshmem: Failed realize() can leave migration blocker behind List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: claudio.fontana@huawei.com, cam@cs.ualberta.ca, mlureau@redhat.com, david.marchand@6wind.com, pbonzini@redhat.com If pci_ivshmem_realize() fails after it created its migration blocker, the blocker is left in place. Fix that by creating it last. Likewise, if it fails after it called fifo8_create(), it leaks fifo memory. Fix that the same way. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/misc/ivshmem.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index eb53d9a..1392426 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -824,6 +824,7 @@ static void ivshmem_write_config(PCIDevice *pdev, uin= t32_t address, static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) { IVShmemState *s =3D IVSHMEM(dev); + Error *err =3D NULL; uint8_t *pci_conf; uint8_t attr =3D PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_PREFETCH; @@ -855,8 +856,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) s->ivshmem_size =3D size; } =20 - fifo8_create(&s->incoming_fifo, sizeof(int64_t)); - /* IRQFD requires MSI */ if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD) && !ivshmem_has_feature(s, IVSHMEM_MSI)) { @@ -878,12 +877,6 @@ static void pci_ivshmem_realize(PCIDevice *dev, Erro= r **errp) s->role_val =3D IVSHMEM_MASTER; /* default */ } =20 - if (s->role_val =3D=3D IVSHMEM_PEER) { - error_setg(&s->migration_blocker, - "Migration is disabled when using feature 'peer mode'= in device 'ivshmem'"); - migrate_add_blocker(s->migration_blocker); - } - pci_conf =3D dev->config; pci_conf[PCI_COMMAND] =3D PCI_COMMAND_IO | PCI_COMMAND_MEMORY; =20 @@ -962,7 +955,19 @@ static void pci_ivshmem_realize(PCIDevice *dev, Erro= r **errp) return; } =20 - create_shared_memory_BAR(s, fd, attr, errp); + create_shared_memory_BAR(s, fd, attr, &err); + if (err) { + error_propagate(errp, err); + return; + } + } + + fifo8_create(&s->incoming_fifo, sizeof(int64_t)); + + if (s->role_val =3D=3D IVSHMEM_PEER) { + error_setg(&s->migration_blocker, + "Migration is disabled when using feature 'peer mode'= in device 'ivshmem'"); + migrate_add_blocker(s->migration_blocker); } } =20 --=20 2.4.3