From nobody Fri Dec 19 17:51: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=1593017621; cv=none; d=zohomail.com; s=zohoarc; b=ivRqSwVcQ9g3IxcMMAnKIiaZvnetaxIZAR9Vu1zzC7qp0DcdmXTAld4duIZOeT5QigiaAIehPnhv6lG1a7zB5QQMaP58z1Pv4A5OuiTJHELHlAMIPPCGYDlUaVdSp8n1Gf+KMYtF+chvISsiKbeOr27m7UfRnwUfb7+LcIEPk3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593017621; 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=DVAoinH9aVdau80DWAEd45l50J258khhha2Mjv4pgKo=; b=TZzKW1c1ZBoBP58bBBZ3AALjDge+RojRw35htwVwbLVCzK5v2u2EGjhWOgIUsLyLAGG2PScxlzITbwObDiUA5IO4ttnFgBfaaHKU7PS8oQIMWbuiMdXYuy18fWkobRsyEM3ZDH0aC7+ztacty/X9Ta7vD76R03COibawQzodEOE= 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 1593017621782243.86991298083137; Wed, 24 Jun 2020 09:53:41 -0700 (PDT) Received: from localhost ([::1]:48378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo8ea-0002wR-FB for importer@patchew.org; Wed, 24 Jun 2020 12:53:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo8VQ-0003gL-Ta for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:12 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41282 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 1jo8VB-00056S-Ew for qemu-devel@nongnu.org; Wed, 24 Jun 2020 12:44:12 -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-198-2ODe8-WJMLS7PkHvgQ1M6g-1; Wed, 24 Jun 2020 12:43:51 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C240B2DA2; Wed, 24 Jun 2020 16:43:50 +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 62A6B5C663; Wed, 24 Jun 2020 16:43:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3BD9C1138485; 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=1593017035; 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=DVAoinH9aVdau80DWAEd45l50J258khhha2Mjv4pgKo=; b=GXMZFg1UEiwADgKwJLrrL3+yOdv5xVzz5EABVAuRnpJpgSopMyEHOYrmkfypvt6JIini1J 8eGsOLg+GjbjG29dL2REzQc2puW+AH2oyvqjV5YGceC8EhUn+DgN85+V5PPNF9BloBECbo aRf//9ajfvJIbgMBBmaQ99KyYH16G4o= X-MC-Unique: 2ODe8-WJMLS7PkHvgQ1M6g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 24/46] qapi: Smooth error checking manually Date: Wed, 24 Jun 2020 18:43:22 +0200 Message-Id: <20200624164344.3778251-25-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.16 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/06/24 00:34:35 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 foo(..., &err) is followed by error_propagate(errp, err), we can often just as well do foo(..., errp). The previous commit did that for simple cases with Coccinelle. Do it for a few more manually. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- accel/kvm/kvm-all.c | 50 ++++++++++++++++++--------------------- block/throttle-groups.c | 5 ++-- bootdevice.c | 4 ++-- hw/core/qdev-properties.c | 12 +++++----- hw/ide/qdev.c | 4 ++-- hw/mem/nvdimm.c | 9 +++---- hw/net/ne2000-isa.c | 4 ++-- hw/usb/dev-storage.c | 4 ++-- net/net.c | 8 ++----- qom/object.c | 30 +++++++++++------------ 10 files changed, 59 insertions(+), 71 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index be02b8e07a..0b921cd24c 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3119,37 +3119,33 @@ static void kvm_set_kernel_irqchip(Object *obj, Vis= itor *v, const char *name, void *opaque, Error **errp) { - Error *err =3D NULL; KVMState *s =3D KVM_STATE(obj); OnOffSplit mode; =20 - visit_type_OnOffSplit(v, name, &mode, &err); - if (err) { - error_propagate(errp, err); + if (!visit_type_OnOffSplit(v, name, &mode, errp)) { return; - } else { - switch (mode) { - case ON_OFF_SPLIT_ON: - s->kernel_irqchip_allowed =3D true; - s->kernel_irqchip_required =3D true; - s->kernel_irqchip_split =3D ON_OFF_AUTO_OFF; - break; - case ON_OFF_SPLIT_OFF: - s->kernel_irqchip_allowed =3D false; - s->kernel_irqchip_required =3D false; - s->kernel_irqchip_split =3D ON_OFF_AUTO_OFF; - break; - case ON_OFF_SPLIT_SPLIT: - s->kernel_irqchip_allowed =3D true; - s->kernel_irqchip_required =3D true; - s->kernel_irqchip_split =3D ON_OFF_AUTO_ON; - break; - default: - /* The value was checked in visit_type_OnOffSplit() above. If - * we get here, then something is wrong in QEMU. - */ - abort(); - } + } + switch (mode) { + case ON_OFF_SPLIT_ON: + s->kernel_irqchip_allowed =3D true; + s->kernel_irqchip_required =3D true; + s->kernel_irqchip_split =3D ON_OFF_AUTO_OFF; + break; + case ON_OFF_SPLIT_OFF: + s->kernel_irqchip_allowed =3D false; + s->kernel_irqchip_required =3D false; + s->kernel_irqchip_split =3D ON_OFF_AUTO_OFF; + break; + case ON_OFF_SPLIT_SPLIT: + s->kernel_irqchip_allowed =3D true; + s->kernel_irqchip_required =3D true; + s->kernel_irqchip_split =3D ON_OFF_AUTO_ON; + break; + default: + /* The value was checked in visit_type_OnOffSplit() above. If + * we get here, then something is wrong in QEMU. + */ + abort(); } } =20 diff --git a/block/throttle-groups.c b/block/throttle-groups.c index dba2bb6451..03a53c89ea 100644 --- a/block/throttle-groups.c +++ b/block/throttle-groups.c @@ -889,8 +889,8 @@ static void throttle_group_set_limits(Object *obj, Visi= tor *v, ThrottleLimits *argp; Error *local_err =3D NULL; =20 - if (!visit_type_ThrottleLimits(v, name, &argp, &local_err)) { - goto ret; + if (!visit_type_ThrottleLimits(v, name, &argp, errp)) { + return; } qemu_mutex_lock(&tg->lock); throttle_get_config(&tg->ts, &cfg); @@ -902,7 +902,6 @@ static void throttle_group_set_limits(Object *obj, Visi= tor *v, =20 unlock: qemu_mutex_unlock(&tg->lock); -ret: qapi_free_ThrottleLimits(argp); error_propagate(errp, local_err); return; diff --git a/bootdevice.c b/bootdevice.c index fb09d3c668..769f40c77d 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -297,8 +297,8 @@ static void device_set_bootindex(Object *obj, Visitor *= v, const char *name, int32_t boot_index; Error *local_err =3D NULL; =20 - if (!visit_type_int32(v, name, &boot_index, &local_err)) { - goto out; + if (!visit_type_int32(v, name, &boot_index, errp)) { + return; } /* check whether bootindex is present in fw_boot_order list */ check_boot_index(boot_index, &local_err); diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index fa88a8885c..11e7d27ccc 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -664,15 +664,15 @@ static void set_pci_devfn(Object *obj, Visitor *v, co= nst char *name, if (!visit_type_str(v, name, &str, &local_err)) { error_free(local_err); local_err =3D NULL; - visit_type_int32(v, name, &value, &local_err); - if (local_err) { - error_propagate(errp, local_err); - } else if (value < -1 || value > 255) { + if (!visit_type_int32(v, name, &value, errp)) { + return; + } + if (value < -1 || value > 255) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : "null", "pci_devfn"); - } else { - *ptr =3D value; + return; } + *ptr =3D value; return; } =20 diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 358f10a92e..ba8b0d7f02 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -245,8 +245,8 @@ static void ide_dev_set_bootindex(Object *obj, Visitor = *v, const char *name, int32_t boot_index; Error *local_err =3D NULL; =20 - if (!visit_type_int32(v, name, &boot_index, &local_err)) { - goto out; + if (!visit_type_int32(v, name, &boot_index, errp)) { + return; } /* check whether bootindex is present in fw_boot_order list */ check_boot_index(boot_index, &local_err); diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index e6fdf6ccc3..d0d6e553cf 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -82,21 +82,18 @@ static void nvdimm_set_uuid(Object *obj, Visitor *v, co= nst char *name, void *opaque, Error **errp) { NVDIMMDevice *nvdimm =3D NVDIMM(obj); - Error *local_err =3D NULL; char *value; =20 - if (!visit_type_str(v, name, &value, &local_err)) { - goto out; + if (!visit_type_str(v, name, &value, errp)) { + return; } =20 if (qemu_uuid_parse(value, &nvdimm->uuid) !=3D 0) { error_setg(errp, "Property '%s.%s' has invalid value", object_get_typename(obj), name); } - g_free(value); =20 -out: - error_propagate(errp, local_err); + g_free(value); } =20 =20 diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index 765bcd1f0b..0594abd93a 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -113,8 +113,8 @@ static void isa_ne2000_set_bootindex(Object *obj, Visit= or *v, int32_t boot_index; Error *local_err =3D NULL; =20 - if (!visit_type_int32(v, name, &boot_index, &local_err)) { - goto out; + if (!visit_type_int32(v, name, &boot_index, errp)) { + return; } /* check whether bootindex is present in fw_boot_order list */ check_boot_index(boot_index, &local_err); diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 1c3bd2578c..721665191e 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -736,8 +736,8 @@ static void usb_msd_set_bootindex(Object *obj, Visitor = *v, const char *name, int32_t boot_index; Error *local_err =3D NULL; =20 - if (!visit_type_int32(v, name, &boot_index, &local_err)) { - goto out; + if (!visit_type_int32(v, name, &boot_index, errp)) { + return; } /* check whether bootindex is present in fw_boot_order list */ check_boot_index(boot_index, &local_err); diff --git a/net/net.c b/net/net.c index d1130296e1..e1f45d3b36 100644 --- a/net/net.c +++ b/net/net.c @@ -1052,7 +1052,6 @@ static int net_client_init(QemuOpts *opts, bool is_ne= tdev, Error **errp) { gchar **substrings =3D NULL; Netdev *object =3D NULL; - Error *err =3D NULL; int ret =3D -1; Visitor *v =3D opts_visitor_new(opts); =20 @@ -1100,16 +1099,13 @@ static int net_client_init(QemuOpts *opts, bool is_= netdev, Error **errp) qemu_opts_set_id(opts, g_strdup_printf("__org.qemu.net%i", idx++)); } =20 - visit_type_Netdev(v, NULL, &object, &err); - - if (!err) { - ret =3D net_client_init1(object, is_netdev, &err); + if (visit_type_Netdev(v, NULL, &object, errp)) { + ret =3D net_client_init1(object, is_netdev, errp); } =20 qapi_free_Netdev(object); =20 out: - error_propagate(errp, err); g_strfreev(substrings); visit_free(v); return ret; diff --git a/qom/object.c b/qom/object.c index 780a700542..b8aac074c2 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1766,9 +1766,11 @@ static void object_set_link_property(Object *obj, Vi= sitor *v, Object *new_target =3D NULL; char *path =3D NULL; =20 - visit_type_str(v, name, &path, &local_err); + if (!visit_type_str(v, name, &path, errp)) { + return; + } =20 - if (!local_err && strcmp(path, "") !=3D 0) { + if (strcmp(path, "") !=3D 0) { new_target =3D object_resolve_link(obj, name, path, &local_err); } =20 @@ -2293,36 +2295,34 @@ static void property_get_tm(Object *obj, Visitor *v= , const char *name, =20 prop->get(obj, &value, &err); if (err) { - goto out; + error_propagate(errp, err); + return; } =20 - if (!visit_start_struct(v, name, NULL, 0, &err)) { - goto out; + if (!visit_start_struct(v, name, NULL, 0, errp)) { + return; } - if (!visit_type_int32(v, "tm_year", &value.tm_year, &err)) { + if (!visit_type_int32(v, "tm_year", &value.tm_year, errp)) { goto out_end; } - if (!visit_type_int32(v, "tm_mon", &value.tm_mon, &err)) { + if (!visit_type_int32(v, "tm_mon", &value.tm_mon, errp)) { goto out_end; } - if (!visit_type_int32(v, "tm_mday", &value.tm_mday, &err)) { + if (!visit_type_int32(v, "tm_mday", &value.tm_mday, errp)) { goto out_end; } - if (!visit_type_int32(v, "tm_hour", &value.tm_hour, &err)) { + if (!visit_type_int32(v, "tm_hour", &value.tm_hour, errp)) { goto out_end; } - if (!visit_type_int32(v, "tm_min", &value.tm_min, &err)) { + if (!visit_type_int32(v, "tm_min", &value.tm_min, errp)) { goto out_end; } - if (!visit_type_int32(v, "tm_sec", &value.tm_sec, &err)) { + if (!visit_type_int32(v, "tm_sec", &value.tm_sec, errp)) { goto out_end; } - visit_check_struct(v, &err); + visit_check_struct(v, errp); out_end: visit_end_struct(v, NULL); -out: - error_propagate(errp, err); - } =20 static void property_release_tm(Object *obj, const char *name, --=20 2.26.2