From nobody Mon Feb 9 17:36:50 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=1593706319; cv=none; d=zohomail.com; s=zohoarc; b=id/hG+C3Y89dJAUccHV2Jvod4z/mQoKWdYl6USKuXLucejQb3wWYRqIzrQeaf/SlRgbW/ArPlZ73iNXV9SApgblpZ0LDTmBk/dXmZX8Lia/r7zMCUho9yHIB5hlyQ01ZxMTFLmfaVKxBN6FDEqU09xWR7lfjHanyVoV50bo/0Yo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593706319; 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=NGLTmacIuiDF8OZZOCJ5tp2EXfpZbk/rf4AYYIFnUZ8=; b=Qg2tfBn+mZa8dlpJZ65goNZ2w15Nc4akLu961KODW6vFeuBXDAChb+P+WEMx6oko5Qucwu7babk94Mg6hnU8zgwO96Mkd6yud3eKaOeGDuYc/orpyBFIYJWRAwEpyLODwytreYQcvndd4qYYV6efcrNn4As1euVb8aimZFoGLSs= 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 1593706319090802.1343611230144; Thu, 2 Jul 2020 09:11:59 -0700 (PDT) Received: from localhost ([::1]:54340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr1ob-0004F7-Pe for importer@patchew.org; Thu, 02 Jul 2020 12:11:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jr1U6-0000u4-7i for qemu-devel@nongnu.org; Thu, 02 Jul 2020 11:50:46 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23175 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 1jr1Tg-0004sG-7x for qemu-devel@nongnu.org; Thu, 02 Jul 2020 11:50:45 -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-280-ksz8im9oMCCcCAJT5JFW_A-1; Thu, 02 Jul 2020 11:50:08 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C16A18FE864; Thu, 2 Jul 2020 15:50:07 +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 DAE781A91F; Thu, 2 Jul 2020 15:50:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EE14B1135225; Thu, 2 Jul 2020 17:50:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593705011; 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=NGLTmacIuiDF8OZZOCJ5tp2EXfpZbk/rf4AYYIFnUZ8=; b=BrCFwKYgKuL2o9LibqDn7bJO+7jhv3alDPbq3gmHfss9b5ZJlgQJkYDVzzMLOFWTUhfl1y LnDeNzOyHtncsPiBmIAtJsF9kZRurNBwTs3UoyM1WWbYBG3QutvbHlT2k51lRvW0Jtnji2 0SzoV0z8Fg5GqLG/S5ynoThmQ7c/h/A= X-MC-Unique: ksz8im9oMCCcCAJT5JFW_A-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 25/44] qom: Use return values to check for error where that's simpler Date: Thu, 2 Jul 2020 17:49:41 +0200 Message-Id: <20200702155000.3455325-26-armbru@redhat.com> In-Reply-To: <20200702155000.3455325-1-armbru@redhat.com> References: <20200702155000.3455325-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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/02 03:42:59 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, 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 --- qom/object.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/qom/object.c b/qom/object.c index 0808da2767..56d858b6a5 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 @@ -1767,14 +1766,17 @@ static void object_set_link_property(Object *obj, V= isitor *v, char *path =3D NULL; =20 visit_type_str(v, name, &path, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } =20 - if (!local_err && strcmp(path, "") !=3D 0) { - new_target =3D object_resolve_link(obj, name, path, &local_err); + if (strcmp(path, "") !=3D 0) { + new_target =3D object_resolve_link(obj, name, path, errp); } =20 g_free(path); - if (local_err) { - error_propagate(errp, local_err); + if (!new_target) { return; } =20 --=20 2.26.2