From nobody Fri Dec 19 19:15:40 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=1594244040; cv=none; d=zohomail.com; s=zohoarc; b=PEeUnJL6jCvIU6qCM9AenMy7ugwANLjF+YwDJAvpPlvIsOsBw9Dv1asTLAx+WRJpIQK1Sk9+mtN3lTWXs/bs8/ISVa2ci+XxGTJHEvFCQDempQLKAuOGbJuAsDz/LV7I94v/9CD8hOjFQgRToksT+pRNrqDTnAkRla7zpBE2/Zs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594244040; 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=F+Iz007iM4ljg0hAwDYaZ3JloafnmmnvzznC4GQNQZs=; b=TehOyQT2sVGYxxXg1sulsHts2qORr8XgfO8hNTu8ebnkUmYULyIxJbTNn1TyKf7h0qiAxWqmkISHyXqIXQYoogGmSzltyIoCEXMl+BnqmSArRZ/lBRELJ2WVQ0PaIX1hfmxn9XVqcpU/IQFhgjPTiOngiK9RFh6ilJqpOKN8jTk= 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 159424404003336.2199015844634; Wed, 8 Jul 2020 14:34:00 -0700 (PDT) Received: from localhost ([::1]:42384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtHhW-0006qC-NZ for importer@patchew.org; Wed, 08 Jul 2020 17:33:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtHbo-0008P6-UK for qemu-devel@nongnu.org; Wed, 08 Jul 2020 17:28:04 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:42057 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 1jtHbn-00026H-0k for qemu-devel@nongnu.org; Wed, 08 Jul 2020 17:28:04 -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-502-4Uzuy3u-Ms62jpBzcOyPKA-1; Tue, 07 Jul 2020 17:25:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2EF89461; Tue, 7 Jul 2020 21:25:10 +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 CD13B6106A; Tue, 7 Jul 2020 21:25:08 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D39DB11326F2; Tue, 7 Jul 2020 23:25:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594243682; 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=F+Iz007iM4ljg0hAwDYaZ3JloafnmmnvzznC4GQNQZs=; b=aaWecYjIhb2cN7ynI+t2Uctqz6u1VQre6C8SZZKWbBof+8rxLPM773unhAYkiiAtfZAwZQ zpkNzbcpmFSy04Jl2HtfPDa3NHENv//jAhm9uKF0GkEN7L3Wg1KxZ33rumyIXF7G/xMOtK DrkPaYrUnE/eVz1WoWIhLsiu6tqXY4c= X-MC-Unique: 4Uzuy3u-Ms62jpBzcOyPKA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 07/53] qemu-option: Check return value instead of @err where convenient Date: Tue, 7 Jul 2020 23:24:17 +0200 Message-Id: <20200707212503.1495927-8-armbru@redhat.com> In-Reply-To: <20200707212503.1495927-1-armbru@redhat.com> References: <20200707212503.1495927-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 17:25:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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: Vladimir Sementsov-Ogievskiy , Greg Kurz 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" Convert uses like opts =3D qemu_opts_create(..., &err); if (err) { ... } to opts =3D qemu_opts_create(..., errp); if (!opts) { ... } Eliminate error_propagate() that are now unnecessary. Delete @err that are now unused. Note that we can't drop parallels_open()'s error_propagate() here. We continue to execute it even in the converted case. It's a no-op then: local_err is null. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Greg Kurz Message-Id: <20200707160613.848843-8-armbru@redhat.com> --- block/parallels.c | 4 ++-- blockdev.c | 5 ++--- qdev-monitor.c | 5 ++--- util/qemu-config.c | 10 ++++------ util/qemu-option.c | 12 ++++-------- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 63a1cde8af..f26f03c926 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -824,8 +824,8 @@ static int parallels_open(BlockDriverState *bs, QDict *= options, int flags, } } =20 - opts =3D qemu_opts_create(¶llels_runtime_opts, NULL, 0, &local_err= ); - if (local_err !=3D NULL) { + opts =3D qemu_opts_create(¶llels_runtime_opts, NULL, 0, errp); + if (!opts) { goto fail_options; } =20 diff --git a/blockdev.c b/blockdev.c index 31d5eaf6bf..b52ed9de86 100644 --- a/blockdev.c +++ b/blockdev.c @@ -504,9 +504,8 @@ static BlockBackend *blockdev_init(const char *file, QD= ict *bs_opts, /* Check common options by copying from bs_opts to opts, all other opt= ions * stay in bs_opts for processing by bdrv_open(). */ id =3D qdict_get_try_str(bs_opts, "id"); - opts =3D qemu_opts_create(&qemu_common_drive_opts, id, 1, &error); - if (error) { - error_propagate(errp, error); + opts =3D qemu_opts_create(&qemu_common_drive_opts, id, 1, errp); + if (!opts) { goto err_no_opts; } =20 diff --git a/qdev-monitor.c b/qdev-monitor.c index 13a13a811a..079cb6001e 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -799,9 +799,8 @@ void qmp_device_add(QDict *qdict, QObject **ret_data, E= rror **errp) QemuOpts *opts; DeviceState *dev; =20 - opts =3D qemu_opts_from_qdict(qemu_find_opts("device"), qdict, &local_= err); - if (local_err) { - error_propagate(errp, local_err); + opts =3D qemu_opts_from_qdict(qemu_find_opts("device"), qdict, errp); + if (!opts) { return; } if (!monitor_cur_is_qmp() && qdev_device_help(opts)) { diff --git a/util/qemu-config.c b/util/qemu-config.c index 772f5a219e..c0d0e9b8ef 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -493,9 +493,8 @@ static void config_parse_qdict_section(QDict *options, = QemuOptsList *opts, goto out; } =20 - subopts =3D qemu_opts_create(opts, NULL, 0, &local_err); - if (local_err) { - error_propagate(errp, local_err); + subopts =3D qemu_opts_create(opts, NULL, 0, errp); + if (!subopts) { goto out; } =20 @@ -538,10 +537,9 @@ static void config_parse_qdict_section(QDict *options,= QemuOptsList *opts, } =20 opt_name =3D g_strdup_printf("%s.%u", opts->name, i++); - subopts =3D qemu_opts_create(opts, opt_name, 1, &local_err); + subopts =3D qemu_opts_create(opts, opt_name, 1, errp); g_free(opt_name); - if (local_err) { - error_propagate(errp, local_err); + if (!subopts) { goto out; } =20 diff --git a/util/qemu-option.c b/util/qemu-option.c index 0ebfd97a98..fd1fd23521 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -670,11 +670,9 @@ void qemu_opts_set(QemuOptsList *list, const char *id, const char *name, const char *value, Error **errp) { QemuOpts *opts; - Error *local_err =3D NULL; =20 - opts =3D qemu_opts_create(list, id, 1, &local_err); - if (local_err) { - error_propagate(errp, local_err); + opts =3D qemu_opts_create(list, id, 1, errp); + if (!opts) { return; } qemu_opt_set(opts, name, value, errp); @@ -1012,10 +1010,8 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, c= onst QDict *qdict, QemuOpts *opts; const QDictEntry *entry; =20 - opts =3D qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, - &local_err); - if (local_err) { - error_propagate(errp, local_err); + opts =3D qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, err= p); + if (!opts) { return NULL; } =20 --=20 2.26.2