From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad0n6-00043a-W4 for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ad0n5-0003vq-1Y for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ad0n4-0003uz-RB for qemu-devel@nongnu.org; Mon, 07 Mar 2016 14:26:02 -0500 From: Markus Armbruster Date: Mon, 7 Mar 2016 20:25:30 +0100 Message-Id: <1457378754-21649-19-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 18/42] ivshmem: Fix harmless misuse of Error 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 We reuse errp after passing it host_memory_backend_get_memory(). If both host_memory_backend_get_memory() and the reuse set an error, the reuse will fail the assertion in error_setv(). Fortunately, host_memory_backend_get_memory() can't fail. Pass it &error_abort to make our assumption explicit, and to get the assertion failure in the right place should it become invalid. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/misc/ivshmem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 2850e8a..eb53d9a 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -841,7 +841,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) g_warning("size argument ignored with hostmem"); } =20 - mr =3D host_memory_backend_get_memory(s->hostmem, errp); + mr =3D host_memory_backend_get_memory(s->hostmem, &error_abort); s->ivshmem_size =3D memory_region_size(mr); } else if (s->sizearg =3D=3D NULL) { s->ivshmem_size =3D 4 << 20; /* 4 MB default */ @@ -906,7 +906,8 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error= **errp) =20 IVSHMEM_DPRINTF("using hostmem\n"); =20 - mr =3D host_memory_backend_get_memory(MEMORY_BACKEND(s->hostmem)= , errp); + mr =3D host_memory_backend_get_memory(MEMORY_BACKEND(s->hostmem)= , + &error_abort); vmstate_register_ram(mr, DEVICE(s)); memory_region_add_subregion(&s->bar, 0, mr); pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar); @@ -1131,7 +1132,7 @@ static void ivshmem_check_memdev_is_busy(Object *ob= j, const char *name, { MemoryRegion *mr; =20 - mr =3D host_memory_backend_get_memory(MEMORY_BACKEND(val), errp); + mr =3D host_memory_backend_get_memory(MEMORY_BACKEND(val), &error_ab= ort); if (memory_region_is_mapped(mr)) { char *path =3D object_get_canonical_path_component(val); error_setg(errp, "can't use already busy memdev: %s", path); --=20 2.4.3