From nobody Mon Nov 17 01:31:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1602239467; cv=none; d=zohomail.com; s=zohoarc; b=Qk2ZCxcjUWIL55t2F6TlYn0g2UTAdAwJAPoR6IAz06tpRO102YxKspfVdcNVx3er7mg4Wzyk6O1B+qzBsiQ/Qjs0fHaaCLk9u+vfAjrq6LyTYc0cq72/VHscZ33NZ1SNzJREKr7c3YtFZSssnjxfiOhM8lOaxcZ6OqoMPJkBloY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602239467; 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=vNav+DERCUy/a734FkJjYSQRh2JivlAmoFtp4uct9DY=; b=PuHhm8DZUWmAqVeXZK1XZS9SorVChpgzMjAj7BnYJ38RSX6zwC5Ow9m3iUPsJZ2FoE1T9TQt60ITs6foqDvT/6wzhRXMs+cfyUSFXUjTYZmkYaDKaMWxK6q33C61/IrKJXhUzxbDjPLAGW6yHY67C4YUWy1+62NowJ7zJtPHmjU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602239467947697.3320135348117; Fri, 9 Oct 2020 03:31:07 -0700 (PDT) Received: from localhost ([::1]:41300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQpg2-00084C-O2 for importer@patchew.org; Fri, 09 Oct 2020 06:31:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQpVV-0005GL-MY for qemu-devel@nongnu.org; Fri, 09 Oct 2020 06:20:14 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:47915 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQpVT-0001nA-R6 for qemu-devel@nongnu.org; Fri, 09 Oct 2020 06:20:13 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4C73wX5xPGz9sWC; Fri, 9 Oct 2020 21:19:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1602238796; bh=yMi9JSvWq3PL1j2sqg+bqydZgz5XuxXnbO6AYlAUWUE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nw8ZNMEWw5YY+v/Rkw1w9qjzyW0bkvoKZ3AyvUypxDrfRKuvIBolMN/lAYPvDLvTH MPCug/A9J2Y67EMrbWiYnFYBWl/xffgrJWJ319lvoho4BW3CwnNzzjDyTyaXUaRRjP cwRbRDrackuglLKQNDHtbl2fUzzgfdy2AyWCVFyY= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 10/20] spapr: Simplify error handling in prop_get_fdt() Date: Fri, 9 Oct 2020 21:19:41 +1100 Message-Id: <20201009101951.1569252-11-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201009101951.1569252-1-david@gibson.dropbear.id.au> References: <20201009101951.1569252-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Vladimir Sementsov-Ogievskiy , dbarboza@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nonngu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Use the return value of visit_check_struct() and visit_check_list() for error checking instead of local_err. This allows to get rid of the error propagation overhead. Signed-off-by: Greg Kurz Message-Id: <20200914123505.612812-10-groug@kaod.org> Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: David Gibson --- hw/ppc/spapr_drc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 04a6bf134e..697b28c343 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -302,7 +302,6 @@ static void prop_get_fdt(Object *obj, Visitor *v, const= char *name, { SpaprDrc *drc =3D SPAPR_DR_CONNECTOR(obj); QNull *null =3D NULL; - Error *err =3D NULL; int fdt_offset_next, fdt_offset, fdt_depth; void *fdt; =20 @@ -321,6 +320,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const= char *name, const struct fdt_property *prop =3D NULL; int prop_len =3D 0, name_len =3D 0; uint32_t tag; + bool ok; =20 tag =3D fdt_next_tag(fdt, fdt_offset, &fdt_offset_next); switch (tag) { @@ -334,10 +334,9 @@ static void prop_get_fdt(Object *obj, Visitor *v, cons= t char *name, case FDT_END_NODE: /* shouldn't ever see an FDT_END_NODE before FDT_BEGIN_NODE */ g_assert(fdt_depth > 0); - visit_check_struct(v, &err); + ok =3D visit_check_struct(v, errp); visit_end_struct(v, NULL); - if (err) { - error_propagate(errp, err); + if (!ok) { return; } fdt_depth--; @@ -355,10 +354,9 @@ static void prop_get_fdt(Object *obj, Visitor *v, cons= t char *name, return; } } - visit_check_list(v, &err); + ok =3D visit_check_list(v, errp); visit_end_list(v, NULL); - if (err) { - error_propagate(errp, err); + if (!ok) { return; } break; --=20 2.26.2