From nobody Tue Apr 30 04:34:06 2024 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 From nobody Tue Apr 30 04:34:06 2024 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=1584463333; cv=none; d=zohomail.com; s=zohoarc; b=QrTJa/Z0eZg3n2JAlrHS2z9kZSyqT8wC3kYaosPY8Qbx36YkuO+3yh30GouVJmsPUjjo5wVay/CheZ5MQrIoHLEYGLsZN+wRINnaDZQWPkxTTGN3MsOHsVVuladR2lv08ChfFbFvwQxWr+V6fNAlCzzP72Yxw7h1XDJX/qfnZKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584463333; 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=Px0X9H785H2y1QeaPhBzK01f4MiNP9U/SjH/J6SPl6k=; b=SPB06pIzdPpbzl/THQCUK8DyBHUx/RXMPtupPMRU/0xoiltCI+7ciZhDeBGZ3w9El5vAHvc0OBpkPP5uaf9829poEa+5BloiEBxKp752JAY1aySzSFFGsenzjGFYQGvmgLn3WwI0j2D1GNtQPrsfwREHMh2t8G6693O2XgU834g= 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 1584463333844488.7332927870532; Tue, 17 Mar 2020 09:42:13 -0700 (PDT) Received: from localhost ([::1]:36690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFIC-0008H7-Ff for importer@patchew.org; Tue, 17 Mar 2020 12:42:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60706) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFA8-0006uP-At for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEFA7-0004wn-1X for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:52 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:42116) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEFA6-0004uo-T7 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:50 -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-197-kDzL92RMOb-Ml7aitxhz4g-1; Tue, 17 Mar 2020 12:33:46 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 55E5F800D5A; 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 256E790808; Tue, 17 Mar 2020 16:33:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A719B11366CC; 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=1584462830; 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=Px0X9H785H2y1QeaPhBzK01f4MiNP9U/SjH/J6SPl6k=; b=JbuFH6jywPCuksszQcEBM2QPaK75yW9zrncwoyJkJ0C+8/fl3DFThVTNhk1mIRNxrjpV7B GME7DUUE8cj0XYbN97+ioevqI3BtThdDWnQfGJUv6yLuidOtwTmMZ6gGeim1UhoOR6Cmcb 6nyRELDbB0jXPt0h4orbEJ+cIeXNl7s= X-MC-Unique: kDzL92RMOb-Ml7aitxhz4g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 2/4] hw/misc/ivshmem: Use one Error * variable instead of two Date: Tue, 17 Mar 2020 17:33:41 +0100 Message-Id: <20200317163343.25028-3-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.11 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] [fuzzy] X-Received-From: 216.205.24.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 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" Commit fe44dc9180 "migration: disallow migrate_add_blocker during migration" accidentally added a second Error * variable. Use the first one instead. Signed-off-by: Markus Armbruster Message-Id: <20200313170517.22480-3-armbru@redhat.com> Reviewed-by: Peter Maydell Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/misc/ivshmem.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 1a0fad74e1..a8dc9b377d 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -832,7 +832,6 @@ static void ivshmem_common_realize(PCIDevice *dev, Erro= r **errp) IVShmemState *s =3D IVSHMEM_COMMON(dev); Error *err =3D NULL; uint8_t *pci_conf; - Error *local_err =3D NULL; =20 /* IRQFD requires MSI */ if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD) && @@ -899,9 +898,9 @@ static void ivshmem_common_realize(PCIDevice *dev, Erro= r **errp) if (!ivshmem_is_master(s)) { error_setg(&s->migration_blocker, "Migration is disabled when using feature 'peer mode' i= n device 'ivshmem'"); - migrate_add_blocker(s->migration_blocker, &local_err); - if (local_err) { - error_propagate(errp, local_err); + migrate_add_blocker(s->migration_blocker, &err); + if (err) { + error_propagate(errp, err); error_free(s->migration_blocker); return; } --=20 2.21.1 From nobody Tue Apr 30 04:34:06 2024 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=1584463232; cv=none; d=zohomail.com; s=zohoarc; b=fiUbiOJVwjUg0HEdd0Cctk1wUjo4jw8YkhoKPp0/SLR7YCzJPdkLsfTRhssGNf5bY9JoIROULZJKlkedffhitPt3gRjiziVm1hWyvAcd8HOjTUycRKaiWg3IRQdBpv7ucL7tuFB8qkDaKZMl+tIckhfeAMSE5fpMmz52OtNrKgc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584463232; 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=wqB72yCY1p7yCeZkg0uizrFc4d/XuUya1TSV3J9ObRM=; b=KSTOTWhXTQSgfbVxrcmYqyz/3XJjmQv55u7SE3uUIkjJ2UxwCnWoUf4cvXXO+ymhw1wQjXfXsGIyNMAeM8YHk675mRDInVpbXSsnVwGrovDilSSSd2ZoiNdCmB3PX+lonuPaB6fd+vJ6JyQKYcPCLt9vJkgJ7kag3Mo9SJDnNi4= 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 1584463232261183.11581362502557; Tue, 17 Mar 2020 09:40:32 -0700 (PDT) Received: from localhost ([::1]:36644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFGZ-0004Gl-7C for importer@patchew.org; Tue, 17 Mar 2020 12:40:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60626) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFA6-0006q2-Ku for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEFA5-0004il-2a 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]:43077) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEFA4-0004dF-TJ for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:48 -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-240-RZ1_-SaDO0C8Q-2_uGCGfg-1; Tue, 17 Mar 2020 12:33:46 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59B30800D5B; 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 27ADC9080A; Tue, 17 Mar 2020 16:33:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AA3CB11366CF; 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=wqB72yCY1p7yCeZkg0uizrFc4d/XuUya1TSV3J9ObRM=; b=DRgUPiUwQvbX6et7whYnM1UwZNhrBkUiq40KY3U+IsJgB9GpBITVjibtH8Q8C1F8fFcDal 6l5wUEKqOBrgJ8ktNR4Nm+8X3RdDDJVnEJg65jJTb1dp4ZrsQIstK6NaCTVo+5KGId9rvH ZucsfWI8gl9+tOFCvkY32vJzVetKtF4= X-MC-Unique: RZ1_-SaDO0C8Q-2_uGCGfg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/4] xen-block: Use one Error * variable instead of two Date: Tue, 17 Mar 2020 17:33:42 +0100 Message-Id: <20200317163343.25028-4-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.11 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" While there, tidy up indentation, and add return just for consistency and robustness. Signed-off-by: Markus Armbruster Message-Id: <20200313170517.22480-4-armbru@redhat.com> Reviewed-by: Peter Maydell Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/block/xen-block.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 3885464513..07bb32e22b 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -998,29 +998,27 @@ static void xen_block_device_destroy(XenBackendInstan= ce *backend, XenBlockVdev *vdev =3D &blockdev->props.vdev; XenBlockDrive *drive =3D blockdev->drive; XenBlockIOThread *iothread =3D blockdev->iothread; + Error *local_err =3D NULL; =20 trace_xen_block_device_destroy(vdev->number); =20 object_unparent(OBJECT(xendev)); =20 if (iothread) { - Error *local_err =3D NULL; - xen_block_iothread_destroy(iothread, &local_err); if (local_err) { error_propagate_prepend(errp, local_err, - "failed to destroy iothread: "); + "failed to destroy iothread: "); return; } } =20 if (drive) { - Error *local_err =3D NULL; - xen_block_drive_destroy(drive, &local_err); if (local_err) { error_propagate_prepend(errp, local_err, - "failed to destroy drive: "); + "failed to destroy drive: "); + return; } } } --=20 2.21.1 From nobody Tue Apr 30 04:34:06 2024 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=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=1584463489; cv=none; d=zohomail.com; s=zohoarc; b=M+v8dmvE+1UNgmrStZIb7rDl6aoXo40bmpnYMoL6GRtjNVTDpbE1o0R5JfixA/gP4nD17KtIvQ0IpdvPzh6WtlzZE930o+8EDtavQV2LbTmP3CEfwB+R+EYroZkomxS7+qqCFvIiq5dmcSsYTc0xC5+D8B9gPJQCYQ8d7W5dnYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584463489; 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=PbZ1Lg9jD4KHSPOVX2F6auSxbLWLK378l9yNhpcLhBA=; b=POgFXDzJe3qD6d6IkkXSJUGf4MM23T5GjKJXRkE5+sD1q6bL+iFsYa7nS+u4oLneHnfcpo5TEYWbyWXxVZFtrYFExgDvcg1w8KoeIrLYIxtrWDLRAWfAhO4hBlJkXviVTicGWbUcTwPaQ+q3Bkx151z2+Ik7H7NkKd8lbWw2qHE= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584463489227120.88928340212635; Tue, 17 Mar 2020 09:44:49 -0700 (PDT) Received: from localhost ([::1]:36747 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFKi-0005b6-6v for importer@patchew.org; Tue, 17 Mar 2020 12:44:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60628) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEFA6-0006q4-R7 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEFA5-0004ik-2W for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:50 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:53250) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEFA4-0004fr-Rj for qemu-devel@nongnu.org; Tue, 17 Mar 2020 12:33:48 -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-273-cVarMCmQPEefaalMvMqsgA-1; Tue, 17 Mar 2020 12:33:46 -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 5F28C107ACCD; 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 2D65160BE0; Tue, 17 Mar 2020 16:33:45 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AD7D311366D1; 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=PbZ1Lg9jD4KHSPOVX2F6auSxbLWLK378l9yNhpcLhBA=; b=dOPR/24rWvkmE60egtOr9+IKZ3JFafOvcMiXjNf2tGo//sYZAIDUEq71kQ8Zp8/9kBheZR dlm+GWAaeq8DDbMgdMzb9A+mcaYVfscUi6XsX2GBI8AFrELa5dg8tGzpthFIp5QYLW5mS3 2u74tiKp3JHwZQyktsIqPB6mn0kpijM= X-MC-Unique: cVarMCmQPEefaalMvMqsgA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 4/4] hw/sd/ssi-sd: fix error handling in ssi_sd_realize Date: Tue, 17 Mar 2020 17:33:43 +0100 Message-Id: <20200317163343.25028-5-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.12 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] [fuzzy] X-Received-From: 216.205.24.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: Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy It's wrong to use same err object as errp parameter for several function calls without intermediate checking for error: we'll crash if try to set err object twice. Fix that. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200317125741.15301-1-vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- hw/sd/ssi-sd.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 91db069212..829797b597 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -255,13 +255,25 @@ static void ssi_sd_realize(SSISlave *d, Error **errp) carddev =3D qdev_create(BUS(&s->sdbus), TYPE_SD_CARD); if (dinfo) { qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo), = &err); + if (err) { + goto fail; + } } + object_property_set_bool(OBJECT(carddev), true, "spi", &err); + if (err) { + goto fail; + } + object_property_set_bool(OBJECT(carddev), true, "realized", &err); if (err) { - error_setg(errp, "failed to init SD card: %s", error_get_pretty(er= r)); - return; + goto fail; } + + return; + +fail: + error_propagate_prepend(errp, err, "failed to init SD card: "); } =20 static void ssi_sd_reset(DeviceState *dev) --=20 2.21.1