From nobody Sat May 4 19:55:28 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=1584119274; cv=none; d=zohomail.com; s=zohoarc; b=PLHo2afvs0V6fQb7fGUa/zDRiXgb8oNxB3i2zwhxAg53y+E5u3iKdkk6/3MGKUrfGh8R/nmFpKVgq43ZxgsQOQaw4G+pO3fH5uD6ZfOTIX7zKHsDVa+o+WhKEh6UxNkMVlka/VD1uF740n9rTe/INjCTfpNlgvzCCC12w9xMpgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584119274; 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=RXFL1Ha/rKYObaZ6v70V4iaynp2s2hyBUXDZFuBgsZc=; b=Dq+Z8W8W4cs3WH8phcr8R3bmJgQGUWZnAJoKzxmEtgKWFp3H3JCoUHN6L/sA0gEFK8ot1Pdjvyky8EdbXktrmtk3PYvs1pMGewS//ETFeEhUn39SA7ddv8REDNsSZeoak3Rnc1sZt9MaieS8Ydz6CNGSGR7gfwweC2/CUsPOYBY= 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 1584119274343188.70632505496076; Fri, 13 Mar 2020 10:07:54 -0700 (PDT) Received: from localhost ([::1]:34164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCnmr-00038a-By for importer@patchew.org; Fri, 13 Mar 2020 13:07:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCnkU-0008GN-N1 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCnkT-0006X1-Dy for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23871 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCnkT-0006WL-9W for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:25 -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-417-ZdOZT-LYMDmYXNzbO3iczA-1; Fri, 13 Mar 2020 13:05:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AE62C1418; Fri, 13 Mar 2020 17:05:19 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 53F141001B34; Fri, 13 Mar 2020 17:05:19 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C626211385ED; Fri, 13 Mar 2020 18:05:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584119125; 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=RXFL1Ha/rKYObaZ6v70V4iaynp2s2hyBUXDZFuBgsZc=; b=Ta7CQfjCL1jbpCeXxyoXKmmc2HAltMQHF7QUur6r4w3EJmxsNKc+X09jdeoxm4e/5LTWfs VZO4/vlSrwh5AZvt942FC5AdsD2kfQLMYHoskufS9XItckQHJF5lk5yQldmhaWEmjCJ5Is NZfwxYVyXXDlmjCaqVnMvrxu+9qmJHE= X-MC-Unique: ZdOZT-LYMDmYXNzbO3iczA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 1/3] Use &error_abort instead of separate assert() Date: Fri, 13 Mar 2020 18:05:15 +0100 Message-Id: <20200313170517.22480-2-armbru@redhat.com> In-Reply-To: <20200313170517.22480-1-armbru@redhat.com> References: <20200313170517.22480-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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: 207.211.31.120 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: alxndr@bu.edu, vsementsov@virtuozzo.com, ashijeetacharya@gmail.com, qemu-block@nongnu.org, paul.durrant@citrix.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" Signed-off-by: Markus Armbruster Acked-by: Alexander Bulekov Reviewed-by: Eric Blake Reviewed-by: Peter Maydell Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/monitor/block-hmp-cmds.c | 4 +--- target/arm/monitor.c | 8 ++------ tests/qtest/fuzz/qos_fuzz.c | 6 ++---- 3 files changed, 5 insertions(+), 13 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..aa9eee6ebf 100644 --- a/tests/qtest/fuzz/qos_fuzz.c +++ b/tests/qtest/fuzz/qos_fuzz.c @@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void) 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 +69,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 Sat May 4 19:55:28 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=1584119205; cv=none; d=zohomail.com; s=zohoarc; b=mFcMKQOVffTkK1gkdaRqwX9rbwY8mVEW+aPZKFJRI+bAvzCc9dYkl4mlPx1+SM41CceaxxWOHWlsXCRSoRvcZo0SxZri21dju4+KTBCdyUN6yvXhzMG6qRc71NsSoro7H6eDIFaytvUEudce3APgqqeaNG2ul+Joh9s1L1rJmk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584119205; 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=wcGUQnF//ws46FOHD+iYW1Ws69BV+qLyFvtgelEnUe8=; b=Ozn+SUAtC78W3CwLjTKXWIPaeqTzfwL1I81JTOm7TPKeOvNO4svQ5r9+J2PPVU2WKNR5ccKr6pcha5zUZlao691NylPyXs4j5IW0JF4+Epw2dQlgFNg5JkIpmbrnuE/FSNqH9u6VU3iW+Y+j732ZexIVyFHLBqIk70ZrqMMtI30= 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 1584119205157871.8125510375253; Fri, 13 Mar 2020 10:06:45 -0700 (PDT) Received: from localhost ([::1]:34147 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCnlj-0001IR-FQ for importer@patchew.org; Fri, 13 Mar 2020 13:06:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35057) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCnkU-0008GC-1z for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCnkS-0006Sj-0H for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49811 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCnkR-0006PW-M0 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:23 -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-346-fW02z642MeCAKRhHG2LXZA-1; Fri, 13 Mar 2020 13:05:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A87AD8024D5; Fri, 13 Mar 2020 17:05:19 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 566351001DF0; Fri, 13 Mar 2020 17:05:19 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CB36911385F4; Fri, 13 Mar 2020 18:05:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584119123; 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=wcGUQnF//ws46FOHD+iYW1Ws69BV+qLyFvtgelEnUe8=; b=go/E21JPdBpGaKmHIjPYCxpstuSM/xjFZRzzcmj0GtUA9+Aw9TmbsDWeID75XZBxT95a5v oh/5HuQkP4PGitqAydud9WkO1ZOTgwu/cd07b4/5Yx+VUcjDlt5KTZclHOGudecltRFMkV bbwmt8rYATAezQsnptKKHCbQ2aMaC6Y= X-MC-Unique: fW02z642MeCAKRhHG2LXZA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 2/3] hw/misc/ivshmem: Use one Error * variable instead of two Date: Fri, 13 Mar 2020 18:05:16 +0100 Message-Id: <20200313170517.22480-3-armbru@redhat.com> In-Reply-To: <20200313170517.22480-1-armbru@redhat.com> References: <20200313170517.22480-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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: 205.139.110.120 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: alxndr@bu.edu, vsementsov@virtuozzo.com, ashijeetacharya@gmail.com, qemu-block@nongnu.org, paul.durrant@citrix.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" 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 Reviewed-by: Eric Blake Reviewed-by: Peter Maydell 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 Sat May 4 19:55:28 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=1584119207; cv=none; d=zohomail.com; s=zohoarc; b=ChAecy4spEeT+OZZ72pUG/MpL+Lv5KpkHXXOfiVkx1i5HBPxfvjQy6IKq1isvlhdDZyv0tZPA/Jn1bxQi1rTtEwzKjIofxLbeewk0NL0FPOmgn19iRiCkLqVI9LD/D2NIELfcBI2Y9NPkOAMqtEiL7Y6piSpdY8wcBpWBv8TadM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584119207; 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=kUaacz0F07iHwqBui53ieGg3mQimCJNRw9rjHNPi9Og=; b=kjNOhelHuHhFhiPufWEcaQU2UomCEeKl2HxzdphUwOhCaWuSGgTuiVOxKazzErYs1/pROXfv9WGR7KWcwYQcTggqF47ClImkoKr+r/KcUVgIeN2xLZxiOXhUkB7e7rhnnBD7VENa2A6mkX35bSkxZv9oiy0OOe1nXh78mxDV3xU= 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 158411920771843.324265592178335; Fri, 13 Mar 2020 10:06:47 -0700 (PDT) Received: from localhost ([::1]:34150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCnlm-0001Nl-L3 for importer@patchew.org; Fri, 13 Mar 2020 13:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35097) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCnkU-0008GE-3N for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCnkT-0006WZ-77 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35346 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCnkT-0006Vo-4N for qemu-devel@nongnu.org; Fri, 13 Mar 2020 13:05:25 -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-245-fkdCrRLKNaOSEmwyoLDOgA-1; Fri, 13 Mar 2020 13:05:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC75A8018D3; Fri, 13 Mar 2020 17:05:19 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58F6210027AB; Fri, 13 Mar 2020 17:05:19 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D42DC1138611; Fri, 13 Mar 2020 18:05:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584119124; 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=kUaacz0F07iHwqBui53ieGg3mQimCJNRw9rjHNPi9Og=; b=csQmuuwoBG0QW8LR5+2xrF+sPs6Z6NiFFiX0H7IlL/l6S8QwnqhdzdIkWh+jTTNk4MQPxz rRiiAiiyCYmy4RmLDsrKkoT0G//Rzz5/0Hk0qoKPvtil3tey8a9eA9SX87N+xmcJf0xU55 ry7xU4K8AQRnkSyMgdsHMJURhXsMqmo= X-MC-Unique: fkdCrRLKNaOSEmwyoLDOgA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 3/3] xen-block: Use one Error * variable instead of two Date: Fri, 13 Mar 2020 18:05:17 +0100 Message-Id: <20200313170517.22480-4-armbru@redhat.com> In-Reply-To: <20200313170517.22480-1-armbru@redhat.com> References: <20200313170517.22480-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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: 207.211.31.120 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: alxndr@bu.edu, vsementsov@virtuozzo.com, ashijeetacharya@gmail.com, qemu-block@nongnu.org, paul.durrant@citrix.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" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/block/xen-block.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 3885464513..7b3b6dee97 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -998,14 +998,13 @@ 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, @@ -1015,8 +1014,6 @@ static void xen_block_device_destroy(XenBackendInstan= ce *backend, } =20 if (drive) { - Error *local_err =3D NULL; - xen_block_drive_destroy(drive, &local_err); if (local_err) { error_propagate_prepend(errp, local_err, --=20 2.21.1 From nobody Sat May 4 19:55:28 2024 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; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584449941416715.6247038982383; Tue, 17 Mar 2020 05:59:01 -0700 (PDT) Received: from localhost ([::1]:60816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEBoC-0002MC-92 for importer@patchew.org; Tue, 17 Mar 2020 08:59:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60148) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEBnP-0001kd-T8 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 08:58:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEBnN-0000r2-Ph for qemu-devel@nongnu.org; Tue, 17 Mar 2020 08:58:10 -0400 Received: from mail-eopbgr10114.outbound.protection.outlook.com ([40.107.1.114]:6215 helo=EUR02-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEBnN-0000an-4Z; Tue, 17 Mar 2020 08:58:09 -0400 Received: from HE1PR0802MB2507.eurprd08.prod.outlook.com (10.175.35.136) by HE1PR0802MB2571.eurprd08.prod.outlook.com (10.175.36.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.22; Tue, 17 Mar 2020 12:58:04 +0000 Received: from HE1PR0802MB2507.eurprd08.prod.outlook.com ([fe80::4d32:e4e1:5b9f:240f]) by HE1PR0802MB2507.eurprd08.prod.outlook.com ([fe80::4d32:e4e1:5b9f:240f%12]) with mapi id 15.20.2814.021; Tue, 17 Mar 2020 12:58:04 +0000 Received: from localhost.localdomain (185.215.60.248) by FR2P281CA0005.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.15 via Frontend Transport; Tue, 17 Mar 2020 12:58:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fQxIuwSUhNzW/TpQoRp1gPZSsToxBW6phPFBX51dSWputCwA/UckFpkcgHWm1ASyQwBSV1uKDhE9EcGP+jp/fcycrlbmjAse+hzScNIJ6/Wq7eoMAsjai0QnZWw7a2s9CnzdNvBdU5f1id4ewPRoZMJvDkoO9XTIg9YXZmK+7/+7Cnv4V1GQWPX7K9DuuoZI7MHJCaQ8MvHsiH/D6s6FnhqJRo7n+1XofPaR7XWRXqFTENJP4kOLMvms0mgcHKpZx5hKO4jv8U7Q6TS0nsv7tF9FU7VYQb5hLWqjDBkc3LDOEkahZvHek6LoXXAOxDPFMTIil4+eROeooA8k2nDTYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m0Kq85s2Ks2Epila95mdgyYaGzCUw+xjcbAH9L8wwco=; b=eM/W/9wY1C1btyUnzae2CmkkR+6G1OTqJZRsx0sKE7EhutT3yF86eVX5LEFWGsHzATlN7QXChLuVXV9GUBBQLNxQuaz3bLYU+O8aBf6CiPnHC9A/AY263J9QSGapomg/NKB0xiyzesTLbnrwUTHbV965IrCsBH8xObMpTl3TH9mo/yRWZYzZMsS62iLG7FeyuwHVa+4FoD/g6aG2oId0WYPwFr9uhDSqRNVE5NVdx9ifXBhUF7vNhlGjZ9FRbgjo2g5MBi+wZLYwNESt/pg7N2qSh7ZrAsDsViWFxe4UF+FVrL8S4P/86ATj2Mp/XTZV1AZsSI2AHn8Aa93yGcSDlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m0Kq85s2Ks2Epila95mdgyYaGzCUw+xjcbAH9L8wwco=; b=PDdk/b1Nz3W9GHXkCyWn2yyYwqIk7CAlsmTmMVjB1sahq+aL829pTNZXXPxwbYeyvY6yMb8fUmqXlee6iE1zPhAAY3zpjEiEp59/lV5+UNW56c3utqmsWeu9Sv/80EuiAXRfzRVNRBpQPjbsiQAsSyeAenWk0dMDC3ksvMVpP9Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v10 4/3] hw/sd/ssi-sd: fix error handling in ssi_sd_realize Date: Tue, 17 Mar 2020 15:57:41 +0300 Message-ID: <20200317125741.15301-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200313170517.22480-1-armbru@redhat.com> References: <20200313170517.22480-1-armbru@redhat.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0005.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::15) To HE1PR0802MB2507.eurprd08.prod.outlook.com (2603:10a6:3:e1::8) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.248] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 433f859c-f332-480d-53f2-08d7ca72d4b0 X-MS-TrafficTypeDiagnostic: HE1PR0802MB2571: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:669; X-Forefront-PRVS: 0345CFD558 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4636009)(366004)(39850400004)(396003)(346002)(136003)(376002)(199004)(16526019)(186003)(2616005)(6486002)(36756003)(2906002)(6506007)(316002)(6916009)(6666004)(26005)(66556008)(66476007)(5660300002)(52116002)(4326008)(1076003)(86362001)(66946007)(478600001)(6512007)(81166006)(8676002)(81156014)(8936002)(956004)(69590400007); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0802MB2571; H:HE1PR0802MB2507.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; 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: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l1aw67l5G3vEfsaXy64mihmcT6S2ofrwBzAvJh7J/9ilIVJgFdmKqZp3aoutFeZuHd4hFb3vd/TLZ02DHFVTmqgcwmsmlPvZyENzk//0sqlD1ChYg4a0pIZyT/L+bt0VOYyLwqwfg031ORMcM+SznBQGx4+OwdMX9OyruU/L9V3CpYwVJaNxkb3x55s8JuH+f1/SAog/o0y0dgw28WzbL1w5jr9et3IV7ahbMa4ZfUQ0ToJDVT4u81BmHdIQ7vFddqf1tIyFjUM31jz0vkc3n7bbv27tHTKecbqOfdrWavbERlsL6G74SA2bB1jzoP4YGqweKWjNHVaeVQf6tZdpVmdmNV/wYdBSxO86viCDggY/sNPndhWE9IYeFupPVWKpgK0l+1wN/uRGU50xZ20O9lUTj3aaAC+jmt4/6I+Acgxy329i8EvwBIML0mG4qkANQL4vXqSSTM92Lb0FHGe9yGNMP/N748Ixm7nWQWJSjsij2G95cfXMx9eOl8sjn+O+ X-MS-Exchange-AntiSpam-MessageData: vZyvMA7I6D6RW+OWl9OWMeoVN7j4uDkiKQuAszJL+rdC9T7FUtDpzjYic0Uiq8nXPK/DwN3/zGCWcyif1uLRq3uW3QnnowqLijdw3nNJ2QnA/FxhygX9BhX26aJ8rs/5/TxwPOm6kQUEZ4qiddCmSQ== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 433f859c-f332-480d-53f2-08d7ca72d4b0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2020 12:58:04.3760 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sxdO4RTmu9WB6Gef1781zu6xJL7vLepn2Q9aa8W67PFS3y8KDu/UVzFCfJk3qRzOmdKS97k0GdFXjphNnBhXeXBSWkcOOcRVdv9CAAumzqU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2571 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.1.114 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: vsementsov@virtuozzo.com, qemu-block@nongnu.org, armbru@redhat.com, alxndr@bu.edu, paul.durrant@citrix.com, ashijeetacharya@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Markus Armbruster Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Forgive me for sending this into your series, but seems it is very appropriate. It's rephrasing of my [PATCH v9 03/10] hw/sd/ssi-sd: fix error handling in ssi_sd_realize for partI series but but without use of ERRP_AUTO_PROPAGATE. 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.0