From nobody Sun Feb 8 22:07:18 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=1570813328; cv=none; d=zoho.com; s=zohoarc; b=WP2dM4jtXB2t68TqqVQ3gi8EsXh06w2rdC5qQ4/pIgWsCqxpr8/8AjrRTBnqDVco9OrkIfh5hM6bAAlwe/R4GKo/HK39yB9rzeqmDnNsPEjBguwP2n3DMOIFXOtlMdrnI2GBcznjHdg6ofacOlfo/97qDObvGWuKDUJVIbqvXi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570813328; 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=EIG89EcBS7KttpYnQuDjWFY5jO+IykZ6GuM9BI8zHec=; b=laTw0WwhwvE8B5S+wSrAANHJCMcJjfVG2rABlyQS1iahAe4skIFe/XAwl9mLAfSkaPif9qtsvPpThMfKOxeq4T5QDXYOh0yGppsMWRmiEwZ6phflVNG1UTJdL9ZRz5R50tz8h7MF303DLALYl2S5Fp3zueaLSfRBT73OcYaPvs8= 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 1570813328835656.3506156921884; Fri, 11 Oct 2019 10:02:08 -0700 (PDT) Received: from localhost ([::1]:54290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyIp-0004nL-1e for importer@patchew.org; Fri, 11 Oct 2019 13:02:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36524) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxQz-0006Li-Lm for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxQy-0004a4-8E for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:29 -0400 Received: from relay.sw.ru ([185.231.240.75]:48178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIxQx-0004J0-UM for qemu-devel@nongnu.org; Fri, 11 Oct 2019 12:06:28 -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 1iIxQm-0003XG-EM; Fri, 11 Oct 2019 19:06:16 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [RFC v5 061/126] NVDIMM: introduce ERRP_AUTO_PROPAGATE Date: Fri, 11 Oct 2019 19:04:47 +0300 Message-Id: <20191011160552.22907-62-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 , vsementsov@virtuozzo.com, Xiao Guangrong , "Michael S. Tsirkin" , armbru@redhat.com, Greg Kurz , Igor Mammedov 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 --- hw/mem/nvdimm.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 375f9a588a..e84d860688 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -44,29 +44,27 @@ static void nvdimm_get_label_size(Object *obj, Visitor = *v, const char *name, static void nvdimm_set_label_size(Object *obj, Visitor *v, const char *nam= e, void *opaque, Error **errp) { + ERRP_AUTO_PROPAGATE(); NVDIMMDevice *nvdimm =3D NVDIMM(obj); - Error *local_err =3D NULL; uint64_t value; =20 if (nvdimm->nvdimm_mr) { - error_setg(&local_err, "cannot change property value"); - goto out; + error_setg(errp, "cannot change property value"); + return; } =20 - visit_type_size(v, name, &value, &local_err); - if (local_err) { - goto out; + visit_type_size(v, name, &value, errp); + if (*errp) { + return; } if (value < MIN_NAMESPACE_LABEL_SIZE) { - error_setg(&local_err, "Property '%s.%s' (0x%" PRIx64 ") is requir= ed" + error_setg(errp, "Property '%s.%s' (0x%" PRIx64 ") is required" " at least 0x%lx", object_get_typename(obj), name, value, MIN_NAMESPACE_LABEL_SIZE); - goto out; + return; } =20 nvdimm->label_size =3D value; -out: - error_propagate(errp, local_err); } =20 static void nvdimm_init(Object *obj) @@ -126,13 +124,12 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice= *nvdimm, Error **errp) static MemoryRegion *nvdimm_md_get_memory_region(MemoryDeviceState *md, Error **errp) { + ERRP_AUTO_PROPAGATE(); NVDIMMDevice *nvdimm =3D NVDIMM(md); - Error *local_err =3D NULL; =20 if (!nvdimm->nvdimm_mr) { - nvdimm_prepare_memory_region(nvdimm, &local_err); - if (local_err) { - error_propagate(errp, local_err); + nvdimm_prepare_memory_region(nvdimm, errp); + if (*errp) { return NULL; } } --=20 2.21.0