From nobody Mon Feb 9 18:43:56 2026 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594139197; cv=none; d=zohomail.com; s=zohoarc; b=B+00hoeEAPc+5ED9ZWzaScdCdusMtB2RbP4xMUWTVa0GR057mRXEfi+oyuRIGTkIq6MC34re3v/fsPGE74/lYBAxKdojpKVl8Fq1Rydvz5D5odrcICKo5USYzR0z9vDuJ5rdmCxLluKG1hB1EKv/UREP1Q3bJypesdz/UzRGItY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594139197; h=Content-Type: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=EkDGHOqQuRpTvJf8aLxYegnJ7IMJSGKlCnRFq/cXGgc=; b=hNs4TOluViwCpr9NixYx8fO9EaW8070s/Kt/Rw+7FwNcIB9RzTBQ3rQf0vioy4zTu6jCkm8SPMdnbD05dNy1vNe+0K4iyHNADvNFR+S7flkYiQ4WwGp5VhQVFJBD0gRPNvc0rRRQKWopnKLVEQ4JtbFGX+3Th7kN/1lUWnYtgAA= 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; 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 1594139197239972.5893105574208; Tue, 7 Jul 2020 09:26:37 -0700 (PDT) Received: from localhost ([::1]:38338 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsqQW-00068Z-2G for importer@patchew.org; Tue, 07 Jul 2020 12:26:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsqGN-0005BU-Q5 for qemu-devel@nongnu.org; Tue, 07 Jul 2020 12:16:07 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:35735 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jsqGM-0000AW-4s for qemu-devel@nongnu.org; Tue, 07 Jul 2020 12:16:07 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-464--PE2HG3YOYaYEI0xe1aAJg-1; Tue, 07 Jul 2020 12:16:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 71DDF107ACF9; Tue, 7 Jul 2020 16:16:00 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7EA88C0072; Tue, 7 Jul 2020 16:15:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CE4EA114425B; Tue, 7 Jul 2020 18:06:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594138565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EkDGHOqQuRpTvJf8aLxYegnJ7IMJSGKlCnRFq/cXGgc=; b=CZDi58qwmwy4KXl4kxEOLZQ/pmabnrfNzZjlNlfNI28NTBEaid3laa1sBocyo0mjJo4Jsk Wt4YwDS/cZ80OiEFqygQFL3qcfXMasnwWu+20Yk8xCnLrWwIKJPRRSHERUPT7Yd6/Pu/UK eCXetJhtibi1+kY4eAHiczSKZigHYck= X-MC-Unique: -PE2HG3YOYaYEI0xe1aAJg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v4 25/45] qom: Use return values to check for error where that's simpler Date: Tue, 7 Jul 2020 18:05:53 +0200 Message-Id: <20200707160613.848843-26-armbru@redhat.com> In-Reply-To: <20200707160613.848843-1-armbru@redhat.com> References: <20200707160613.848843-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 00:31:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: peter.maydell@linaro.org, vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, groug@kaod.org, pbonzini@redhat.com 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" When using the Error object to check for error, we need to receive it into a local variable, then propagate() it to @errp. Using the return value permits allows receiving it straight to @errp. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- qom/object.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/qom/object.c b/qom/object.c index 0808da2767..3a7c062f8e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -549,8 +549,7 @@ void object_initialize_child_with_propsv(Object *parent= obj, object_initialize(childobj, size, type); obj =3D OBJECT(childobj); =20 - object_set_propv(obj, &local_err, vargs); - if (local_err) { + if (object_set_propv(obj, errp, vargs) < 0) { goto out; } =20 @@ -743,7 +742,7 @@ Object *object_new_with_propv(const char *typename, } obj =3D object_new_with_type(klass->type); =20 - if (object_set_propv(obj, &local_err, vargs) < 0) { + if (object_set_propv(obj, errp, vargs) < 0) { goto error; } =20 @@ -1763,20 +1762,24 @@ static void object_set_link_property(Object *obj, V= isitor *v, LinkProperty *prop =3D opaque; Object **targetp =3D object_link_get_targetp(obj, prop); Object *old_target =3D *targetp; - Object *new_target =3D NULL; + Object *new_target; char *path =3D NULL; =20 - visit_type_str(v, name, &path, &local_err); + if (!visit_type_str(v, name, &path, errp)) { + return; + } =20 - if (!local_err && strcmp(path, "") !=3D 0) { - new_target =3D object_resolve_link(obj, name, path, &local_err); + if (*path) { + new_target =3D object_resolve_link(obj, name, path, errp); + if (!new_target) { + g_free(path); + return; + } + } else { + new_target =3D NULL; } =20 g_free(path); - if (local_err) { - error_propagate(errp, local_err); - return; - } =20 prop->check(obj, name, new_target, &local_err); if (local_err) { --=20 2.26.2