From nobody Sun Feb 8 18:29:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1570812199; cv=none; d=zoho.com; s=zohoarc; b=dlyiULLI4GmB6msrCk/+IzKcM31DK2CBPEWXGzyZJ6FnZ4aRYSsDR2QEwjjvaeSgXoVHjVg+3sqs09PVgfpwyrHEM76NBJPUa1fuimfKItpSazZwyY0rn1Yl7yYehxDxttG3geIPvXFptVr7BOMk0UUaZ4lFx34Ce+Xs24Iz9/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570812199; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mBjnN7E/hoA0P2hjbjBsMokeZZnQHigPtkSN7GDG4ig=; b=g566wnxKVKeVqLwumdz7Y5aoxJJoNV67lf94zK6k2JcQg+R22YTCy8SCgyUyTKS2rzQkPSNIkIASzUNOMD7cEEUsnViULwpoSI7CtrZM7tHJmHwMwfBpdTLh5PVtabCzwwJM6BzP/QLFuIXhygfmfCvhdFxPODL3/R58A4+2oRs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570812199586977.6684943358616; Fri, 11 Oct 2019 09:43:19 -0700 (PDT) Received: from localhost ([::1]:54084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIy0b-0007UP-Ry for importer@patchew.org; Fri, 11 Oct 2019 12:43:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36695) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxR4-0006Ua-S2 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxR2-0004fX-GP for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:34 -0400 Received: from relay.sw.ru ([185.231.240.75]:48306) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxR2-0004Nb-8D for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:32 -0400 Received: from [10.94.3.0] (helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iIxQq-0003XG-QV; Fri, 11 Oct 2019 19:06:20 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 072/126] Memory API: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:58 +0300 Message-Id: <20191011160552.22907-73-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191011160552.22907-1-vsementsov@virtuozzo.com> References: <20191011160552.22907-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Paolo Bonzini , vsementsov@virtuozzo.com, armbru@redhat.com, Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If we want to add some info to errp (by error_prepend() or error_append_hint()), we must use the ERRP_AUTO_PROPAGATE macro. Otherwise, this info will not be added when errp =3D=3D &fatal_err (the program will exit prior to the error_append_hint() or error_prepend() call). Fix such cases. If we want to check error after errp-function call, we need to introduce local_err and than propagate it to errp. Instead, use ERRP_AUTO_PROPAGATE macro, benefits are: 1. No need of explicit error_propagate call 2. No need of explicit local_err variable: use errp directly 3. ERRP_AUTO_PROPAGATE leaves errp as is if it's not NULL or &error_fatel, this means that we don't break error_abort (we'll abort on error_set, not on error_propagate) This commit (together with its neighbors) was generated by for f in $(git grep -l errp \*.[ch]); do \ spatch --sp-file scripts/coccinelle/auto-propagated-errp.cocci \ --macro-file scripts/cocci-macro-file.h --in-place --no-show-diff $f; \ done; then fix a bit of compilation problems: coccinelle for some reason leaves several f() { ... goto out; ... out: } patterns, with "out:" at function end. then ./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)" (auto-msg was a file with this commit message) Still, for backporting it may be more comfortable to use only the first command and then do one huge commit. Reported-by: Kevin Wolf Reported-by: Greg Kurz Signed-off-by: Vladimir Sementsov-Ogievskiy --- memory.c | 63 ++++++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/memory.c b/memory.c index 978da3d3df..b46b5f41e9 100644 --- a/memory.c +++ b/memory.c @@ -1524,17 +1524,16 @@ void memory_region_init_ram_shared_nomigrate(Memory= Region *mr, bool share, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); memory_region_init(mr, owner, name, size); mr->ram =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc(size, share, mr, &err); + mr->ram_block =3D qemu_ram_alloc(size, share, mr, errp); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; - if (err) { + if (*errp) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); - error_propagate(errp, err); } } =20 @@ -1548,18 +1547,17 @@ void memory_region_init_resizeable_ram(MemoryRegion= *mr, void *host), Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); memory_region_init(mr, owner, name, size); mr->ram =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D qemu_ram_alloc_resizeable(size, max_size, resized, - mr, &err); + mr, errp); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; - if (err) { + if (*errp) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); - error_propagate(errp, err); } } =20 @@ -1573,18 +1571,17 @@ void memory_region_init_ram_from_file(MemoryRegion = *mr, const char *path, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); memory_region_init(mr, owner, name, size); mr->ram =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; mr->align =3D align; - mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, = &err); + mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, = errp); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; - if (err) { + if (*errp) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); - error_propagate(errp, err); } } =20 @@ -1596,19 +1593,18 @@ void memory_region_init_ram_from_fd(MemoryRegion *m= r, int fd, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); memory_region_init(mr, owner, name, size); mr->ram =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D qemu_ram_alloc_from_fd(size, mr, share ? RAM_SHARED : 0, - fd, &err); + fd, errp); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; - if (err) { + if (*errp) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); - error_propagate(errp, err); } } #endif @@ -1667,18 +1663,17 @@ void memory_region_init_rom_nomigrate(MemoryRegion = *mr, uint64_t size, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); memory_region_init(mr, owner, name, size); mr->ram =3D true; mr->readonly =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc(size, false, mr, &err); + mr->ram_block =3D qemu_ram_alloc(size, false, mr, errp); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; - if (err) { + if (*errp) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); - error_propagate(errp, err); } } =20 @@ -1690,7 +1685,7 @@ void memory_region_init_rom_device_nomigrate(MemoryRe= gion *mr, uint64_t size, Error **errp) { - Error *err =3D NULL; + ERRP_AUTO_PROPAGATE(); assert(ops); memory_region_init(mr, owner, name, size); mr->ops =3D ops; @@ -1698,11 +1693,10 @@ void memory_region_init_rom_device_nomigrate(Memory= Region *mr, mr->terminates =3D true; mr->rom_device =3D true; mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc(size, false, mr, &err); - if (err) { + mr->ram_block =3D qemu_ram_alloc(size, false, mr, errp); + if (*errp) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); - error_propagate(errp, err); } } =20 @@ -3162,12 +3156,11 @@ void memory_region_init_ram(MemoryRegion *mr, uint64_t size, Error **errp) { + ERRP_AUTO_PROPAGATE(); DeviceState *owner_dev; - Error *err =3D NULL; =20 - memory_region_init_ram_nomigrate(mr, owner, name, size, &err); - if (err) { - error_propagate(errp, err); + memory_region_init_ram_nomigrate(mr, owner, name, size, errp); + if (*errp) { return; } /* This will assert if owner is neither NULL nor a DeviceState. @@ -3186,12 +3179,11 @@ void memory_region_init_rom(MemoryRegion *mr, uint64_t size, Error **errp) { + ERRP_AUTO_PROPAGATE(); DeviceState *owner_dev; - Error *err =3D NULL; =20 - memory_region_init_rom_nomigrate(mr, owner, name, size, &err); - if (err) { - error_propagate(errp, err); + memory_region_init_rom_nomigrate(mr, owner, name, size, errp); + if (*errp) { return; } /* This will assert if owner is neither NULL nor a DeviceState. @@ -3212,13 +3204,12 @@ void memory_region_init_rom_device(MemoryRegion *mr, uint64_t size, Error **errp) { + ERRP_AUTO_PROPAGATE(); DeviceState *owner_dev; - Error *err =3D NULL; =20 memory_region_init_rom_device_nomigrate(mr, owner, ops, opaque, - name, size, &err); - if (err) { - error_propagate(errp, err); + name, size, errp); + if (*errp) { return; } /* This will assert if owner is neither NULL nor a DeviceState. --=20 2.21.0