From nobody Mon Feb 9 00:01:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1643285424; cv=none; d=zohomail.com; s=zohoarc; b=jiKq4wtHaM0Q/92F5bRjufPpvwzPuOr0xGk8HBAh/WyU0OfzkdMcrosiwsOlCYVna/dkOr6jXS3nStq3O+gptTKlASl1aeM7+5NucvAjAAPHQLilxf5ZxyVGAH5Qtq4EZUMuLi28j4dC4Fb20Oi/ngsUnIYcsb5QfkCyTiXfsiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643285424; 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=Zld+Z14lPntaDcU318MSf9lAeevfMx47AxegRJNf6jE=; b=mzcRe5LtHD/UzkuDSklSeoO7ob7bB3Rj1Ks9mesYZ8vj1fwaEmQSe99SLIa1BvZo+oNwh36cSCQbOM2HJ1Qw49082ufaaHF0MR5uBEeDZVIR1DfFn6AIgFSMWscCAX/FmfzgxpQleNrATL/3l2zuSxdAncUpb5TpXzLSaEm0VbA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643285424418984.224962855981; Thu, 27 Jan 2022 04:10:24 -0800 (PST) Received: from localhost ([::1]:34142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nD3ba-0003GX-JT for importer@patchew.org; Thu, 27 Jan 2022 07:10:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2xk-0005eC-Uv for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:29:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:58411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nD2xi-0000Nh-ND for qemu-devel@nongnu.org; Thu, 27 Jan 2022 06:29:12 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-183-TkyVzbioPE6knNspAHUnkQ-1; Thu, 27 Jan 2022 06:29:06 -0500 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 B26A3196E6C4; Thu, 27 Jan 2022 11:29:05 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-7.ams2.redhat.com [10.36.112.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0804167A8; Thu, 27 Jan 2022 11:29:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 66B5D1138221; Thu, 27 Jan 2022 12:28:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643282950; 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=Zld+Z14lPntaDcU318MSf9lAeevfMx47AxegRJNf6jE=; b=T6me36FDJTMezps9YYJJCiLhBAptxh1gY9XZ6HK0zpA+jb/bTorGwrpTOafewyPH2QfSnN 0KlSmi2rk1M55ABfBWh1FcrUNgrmwnt1dUeWyB+aAtR6oH3C5EFGTSx3dvomvCOZDBZQxE 0KcRAiHeKB7NzGUn/wqAEn2+ecI+iv4= X-MC-Unique: TkyVzbioPE6knNspAHUnkQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/8] qapi/commands: refactor error handling code Date: Thu, 27 Jan 2022 12:28:54 +0100 Message-Id: <20220127112859.222484-4-armbru@redhat.com> In-Reply-To: <20220127112859.222484-1-armbru@redhat.com> References: <20220127112859.222484-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=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.159, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1643285427094100001 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Move error_propagate() to if (err) and make "if (err)" block mandatory. This is to simplify further commit, which will bring trace events generation for QMP commands. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Hajnoczi Message-Id: <20220126161130.3240892-3-vsementsov@virtuozzo.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- docs/devel/qapi-code-gen.rst | 2 +- scripts/qapi/commands.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst index a3b5473089..feafed79b5 100644 --- a/docs/devel/qapi-code-gen.rst +++ b/docs/devel/qapi-code-gen.rst @@ -1690,8 +1690,8 @@ Example:: } =20 retval =3D qmp_my_command(arg.arg1, &err); - error_propagate(errp, err); if (err) { + error_propagate(errp, err); goto out; } =20 diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index 21001bbd6b..17e5ed2414 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -74,14 +74,18 @@ def gen_call(name: str, ret =3D mcgen(''' =20 %(lhs)sqmp_%(c_name)s(%(args)s&err); - error_propagate(errp, err); ''', c_name=3Dc_name(name), args=3Dargstr, lhs=3Dlhs) - if ret_type: - ret +=3D mcgen(''' + + ret +=3D mcgen(''' if (err) { + error_propagate(errp, err); goto out; } +''') + + if ret_type: + ret +=3D mcgen(''' =20 qmp_marshal_output_%(c_name)s(retval, ret, errp); ''', --=20 2.31.1