From nobody Fri Dec 19 17:51:38 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593017733; cv=none; d=zohomail.com; s=zohoarc; b=NXf0G2wz/JHTs7SrdsUeO83XfNZqAXfI0l5h7ncS/Q6G0x490waVZi3iNj9Cz8OsGxOt1WiQoPydLKJUv8aOibAyLxp895YFbXKW9KmAc+wwiQ8aHCG4OsMhEPyXDtBvshipD4bFqPDyquURk8YSko6CoTTH6zY0mojglATBPfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593017733; 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=zH34zgMpegMl42K06K+C/gWszx2iMgiSY6U+axlkSV0=; b=TmA4XWg9uBoBRUEyKb8fmrCvA3sSBVB6N3VRjsEqoxOBiuA9XTpc/JAc/ncfDleGpLQWFZQi3/6uuqHGraHvM9IAWgDerKxjnKRM5+xE7lXDBWALTT2UHGZN1XafMHq3CkM5cY/xWEutZUssjpzA2TSBKBLchBrBvAFDU+uQRwg= 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 1593017733302786.0175293740738; Wed, 24 Jun 2020 09:55:33 -0700 (PDT) Received: from localhost ([::1]:56460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo8gN-0006Ds-VT for importer@patchew.org; Wed, 24 Jun 2020 12:55:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo8VN-0003W1-IN for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:09 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22882 helo=us-smtp-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 1jo8VB-00056E-6R for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:09 -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-250-U9FnKZ_wP1GzXtALRcfqIA-1; Wed, 24 Jun 2020 12:43:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 16D94804003; Wed, 24 Jun 2020 16:43:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D906F7CADB; Wed, 24 Jun 2020 16:43:51 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 62CE11138490; Wed, 24 Jun 2020 18:43:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593017034; 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=zH34zgMpegMl42K06K+C/gWszx2iMgiSY6U+axlkSV0=; b=I5oF3ZgLURMqDrrpCG5ZGlpMBCQR59oiiSnidaKt+dLgamN0MFINxL1C0RmaLUBnFs3T1c d5/ratpEQjktTcV/d4/Q7wDAnDftU4tsonTpX7dsN87OBs/fKH9dvrLCp5IqbICcIOtdaH r4i7eizAqH8lTxevwEQmKYquYdCYupo= X-MC-Unique: U9FnKZ_wP1GzXtALRcfqIA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 35/46] qom: Use return values to check for error where that's simpler Date: Wed, 24 Jun 2020 18:43:33 +0200 Message-Id: <20200624164344.3778251-36-armbru@redhat.com> In-Reply-To: <20200624164344.3778251-1-armbru@redhat.com> References: <20200624164344.3778251-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 03:27:53 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 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qom/object.c b/qom/object.c index f6e9f0e413..326a8de91e 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 @@ -1771,12 +1770,11 @@ static void object_set_link_property(Object *obj, V= isitor *v, } =20 if (strcmp(path, "") !=3D 0) { - new_target =3D object_resolve_link(obj, name, path, &local_err); + 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