From nobody Mon Feb 9 12:10:12 2026 Delivered-To: importer@patchew.org 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; 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=1584463219; cv=none; d=zohomail.com; s=zohoarc; b=cDJIF/p+jh1AH4gkLhVPbaO6CPhfHlR4nj3aQpLcrfj3nd5Pdao96vb3fbYpDQRAk1jQtaHK8TBlLlbHL9WqXleZIv27PXXs8aU8NIAwAQkOi3QJwODGU8qsOJOQSt9zCMepEdMWao+QNKmTp8K7OBnWtRvifB9T5goNIIPu/Tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584463219; 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=1BwQ9SyQvIJxqZ5SBRv3hBKJAApJJPdQqPfT8kHqKZ8=; b=HzLWz5rjMzbd1Tjl1wjcpo4+CdKfCb+giavSigxWX1cWnCBoJl3+npvxT0Vjuz+CDmD3Bv7/Bq38W+n5psy7F1APAGB3NXIjyr5+z+/DBOQJnwD6OSX7dRQ8FGAoFWIp6/y0c/2/cWAk358Qg4vP+MRQwsqxLtSKEqp8yOM5RMk= 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 1584463219680618.7174552651895; Tue, 17 Mar 2020 09:40:19 -0700 (PDT) Received: from localhost ([::1]:36642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFGM-0003qs-Gc for importer@patchew.org; Tue, 17 Mar 2020 12:40:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60635) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFA6-0006qi-SH for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEFA5-0004j1-5v for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:50 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:58745) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEFA5-0004gD-0l for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:49 -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-80-CDndHtbtNrGpoTWTUZEh7Q-1; Tue, 17 Mar 2020 12:33:46 -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 636E5800D5C; Tue, 17 Mar 2020 16:33:45 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-130.ams2.redhat.com [10.36.112.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31A917E318; Tue, 17 Mar 2020 16:33:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A41881138405; Tue, 17 Mar 2020 17:33:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584462828; 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=1BwQ9SyQvIJxqZ5SBRv3hBKJAApJJPdQqPfT8kHqKZ8=; b=CG3TMCyHHUSJTBhkpe35E4YDmJqy7wW4CZrhGEFvl77T4/LlgKW8uiYsmv41QOV99sgJVy 9GLPqNNXO1Ya3tXa+gW9MR2oL429ADOunaJL5o6anybvKXrc3NRFcYwUj2EdEe+TBrytjC q1Tm3CPK8Tey/VhvNxgQvD6Lz5WU51k= X-MC-Unique: CDndHtbtNrGpoTWTUZEh7Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/4] Use &error_abort instead of separate assert() Date: Tue, 17 Mar 2020 17:33:40 +0100 Message-Id: <20200317163343.25028-2-armbru@redhat.com> In-Reply-To: <20200317163343.25028-1-armbru@redhat.com> References: <20200317163343.25028-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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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 , Vladimir Sementsov-Ogievskiy , Alexander Bulekov 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" Signed-off-by: Markus Armbruster Message-Id: <20200313170517.22480-2-armbru@redhat.com> Reviewed-by: Peter Maydell Acked-by: Alexander Bulekov Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy [Unused Error *variable deleted] --- block/monitor/block-hmp-cmds.c | 4 +--- target/arm/monitor.c | 8 ++------ tests/qtest/fuzz/qos_fuzz.c | 7 ++----- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index c3a6368dfc..4c8c375172 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -838,10 +838,8 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qd= ict) void hmp_info_block_jobs(Monitor *mon, const QDict *qdict) { BlockJobInfoList *list; - Error *err =3D NULL; =20 - list =3D qmp_query_block_jobs(&err); - assert(!err); + list =3D qmp_query_block_jobs(&error_abort); =20 if (!list) { monitor_printf(mon, "No active jobs\n"); diff --git a/target/arm/monitor.c b/target/arm/monitor.c index c2dc7908de..ea6598c412 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -206,9 +206,7 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(Cp= uModelExpansionType type, return NULL; } } else { - Error *err =3D NULL; - arm_cpu_finalize_features(ARM_CPU(obj), &err); - assert(err =3D=3D NULL); + arm_cpu_finalize_features(ARM_CPU(obj), &error_abort); } =20 expansion_info =3D g_new0(CpuModelExpansionInfo, 1); @@ -221,12 +219,10 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(= CpuModelExpansionType type, while ((name =3D cpu_model_advertised_features[i++]) !=3D NULL) { ObjectProperty *prop =3D object_property_find(obj, name, NULL); if (prop) { - Error *err =3D NULL; QObject *value; =20 assert(prop->get); - value =3D object_property_get_qobject(obj, name, &err); - assert(!err); + value =3D object_property_get_qobject(obj, name, &error_abort); =20 qdict_put_obj(qdict_out, name, value); } diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c index 1a99277d60..af28c92866 100644 --- a/tests/qtest/fuzz/qos_fuzz.c +++ b/tests/qtest/fuzz/qos_fuzz.c @@ -55,10 +55,8 @@ static void qos_set_machines_devices_available(void) QObject *response; QDict *args =3D qdict_new(); QList *lst; - Error *err =3D NULL; =20 - qmp_marshal_query_machines(NULL, &response, &err); - assert(!err); + qmp_marshal_query_machines(NULL, &response, &error_abort); lst =3D qobject_to(QList, response); apply_to_qlist(lst, true); =20 @@ -70,8 +68,7 @@ static void qos_set_machines_devices_available(void) qdict_put_bool(args, "abstract", true); qdict_put_obj(req, "arguments", (QObject *) args); =20 - qmp_marshal_qom_list_types(args, &response, &err); - assert(!err); + qmp_marshal_qom_list_types(args, &response, &error_abort); lst =3D qobject_to(QList, response); apply_to_qlist(lst, false); qobject_unref(response); --=20 2.21.1