From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai6gR-0000Rg-Sf for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai6gP-0000ol-G5 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai6gP-0000oE-15 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 16:44:13 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 99FE81E54 for ; Mon, 21 Mar 2016 20:44:12 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2LKi88R026835 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 21 Mar 2016 16:44:11 -0400 From: Markus Armbruster Date: Mon, 21 Mar 2016 21:43:39 +0100 Message-Id: <1458593043-31731-17-git-send-email-armbru@redhat.com> In-Reply-To: <1458593043-31731-1-git-send-email-armbru@redhat.com> References: <1458593043-31731-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] [PULL v2 16/40] ivshmem: Fix harmless misuse of Error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Message-Id: <1458066895-20632-17-git-send-email-armbru@redhat.com> --- 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 0ac0238..299cf5b 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -842,7 +842,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 */ @@ -907,7 +907,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); @@ -1134,7 +1135,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