From nobody Mon Feb 9 17:36:55 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=1669020911; cv=none; d=zohomail.com; s=zohoarc; b=M0Pb2f+PVuJdENpCl4EP/OM9+66bECFsst82/qyHu4RDI2PxfmWoP4GxF4iz0WutBqo7b1/DgLZLIbKfizZ6I8evjISl3HlJV9oCQrej69kH3GzsJOyXaA0LXfogTChDiBWZNN+soWgk6fW7O1gb2dLUx/pWMxgG4xI2FrN/jzs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669020911; 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=+aiIidnJhvNUHF76/U3S+18BlPO7cg2BAPDF2EnkQ7w=; b=ZyiTlUYov5qSAaXzAjYXIKz4azG+uiGrBDcEYifudeh7D80wNlPSv9zcyadzz1+aubnKOPSCjL7VOSo6WTq1M8XL27fQmuFGwicIeFJI2HRc+DOTvFMQWAGme+oEjLoMvirfxLcDF+9VQmYLeFucthqE7oaCyajz+SClBKD+WUA= 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 1669020911823154.10886934472217; Mon, 21 Nov 2022 00:55:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ox2WG-0003T8-Ew; Mon, 21 Nov 2022 03:51:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ox2WF-0003SY-B7 for qemu-devel@nongnu.org; Mon, 21 Nov 2022 03:51:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ox2WD-00019i-ID for qemu-devel@nongnu.org; Mon, 21 Nov 2022 03:51:10 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-339-UVFXL3B7PPavb-YGIngTvw-1; Mon, 21 Nov 2022 03:51:01 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1AEE185A78F; Mon, 21 Nov 2022 08:51:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BF6B04EA4A; Mon, 21 Nov 2022 08:51:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 60DC521E66F5; Mon, 21 Nov 2022 09:50:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669020668; 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=+aiIidnJhvNUHF76/U3S+18BlPO7cg2BAPDF2EnkQ7w=; b=Vjgq8bBDYYedHDLBJxT0jk3qZzwwlXMQ2j6pDtrKkkLI1MyzL2WURBZazi2oxY9LdqHh5z M96nClTuY50bRYK8cjJym3kkL/lJawxS/C4dz/3F8ds85moLotr5+i23QL36/IKpMDgRDy tbUXI3ukcjnIb0r5OS9EIQjIpsFn0t0= X-MC-Unique: UVFXL3B7PPavb-YGIngTvw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: eblake@redhat.com, vsementsov@yandex-team.ru Subject: [PATCH 07/10] qemu-config: Use ERRP_GUARD() where obviously appropriate Date: Mon, 21 Nov 2022 09:50:51 +0100 Message-Id: <20221121085054.683122-8-armbru@redhat.com> In-Reply-To: <20221121085054.683122-1-armbru@redhat.com> References: <20221121085054.683122-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669020912603100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster --- util/qemu-config.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/util/qemu-config.c b/util/qemu-config.c index e983607b46..8c907fa83b 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -318,9 +318,9 @@ void qemu_add_opts(QemuOptsList *list) static int qemu_config_foreach(FILE *fp, QEMUConfigCB *cb, void *opaque, const char *fname, Error **errp) { + ERRP_GUARD(); char line[1024], prev_group[64], group[64], arg[64], value[1024]; Location loc; - Error *local_err =3D NULL; QDict *qdict =3D NULL; int res =3D -EINVAL, lno =3D 0; int count =3D 0; @@ -348,10 +348,9 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB = *cb, void *opaque, } if (qdict !=3D prev) { if (prev) { - cb(prev_group, prev, opaque, &local_err); + cb(prev_group, prev, opaque, errp); qobject_unref(prev); - if (local_err) { - error_propagate(errp, local_err); + if (*errp) { goto out; } } --=20 2.37.3