From nobody Sun Nov 16 23:02:10 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=1602227249; cv=none; d=zohomail.com; s=zohoarc; b=DZt7VxMovF8V/Y9UT4O0ZB428U7bZ9wqs3kMblgNft8FenQcd1IweAdUiscByQFR4nXd8Nb9m0928QqLSX0N4dbI/5nJ2osrTuG7jkBpfhR0XUeVI6DsVv4w/q1KUoUErS9oHAIOfBq71YVKSB3q2u4RgazhfPlaJ0H3GLZ6AZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602227249; 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=jnQ1XXBShemBdeQxqX+TEAIgc/npcLrb5M/nVdh5n5o=; b=mSOCZyM2lT6cP/pyjMmQvxo6wD9MHQPpOoYlNAP/0ZjybqCuLB2Pj95SGCNcaJN43Dan2EpJ2MH2CGU6BbjTowgQfojc53811qTmT2mtfXZhJ9bwQCxhbni3DpNvNF/PICEtK75v8sj88kfmsmPM2O+UZdn+xnVOxt/oQ195oF8= 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 1602227249045641.9036642170836; Fri, 9 Oct 2020 00:07:29 -0700 (PDT) Received: from localhost ([::1]:48426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQmUx-0006Tm-PJ for importer@patchew.org; Fri, 09 Oct 2020 03:07:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQmDH-00009x-8S for qemu-devel@nongnu.org; Fri, 09 Oct 2020 02:49:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQmDE-0001aC-PB for qemu-devel@nongnu.org; Fri, 09 Oct 2020 02:49:10 -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-543-WTUU5pOoM0OgTeL0BYdQPA-1; Fri, 09 Oct 2020 02:49:04 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82D0A1018F83; Fri, 9 Oct 2020 06:49:03 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E60519481; Fri, 9 Oct 2020 06:49:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 943F8112CE12; Fri, 9 Oct 2020 08:48:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602226147; 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=jnQ1XXBShemBdeQxqX+TEAIgc/npcLrb5M/nVdh5n5o=; b=OXN35m29OeXWFh+kWXlnnUifemyre/1VzHz800X1HAoW4j0FqFqTW7w4DCf8EICZkRw3oj 0kixNxxfoIKZVB08kNALEpiSBG4xFKhrp4gHzaXgQS4X3SHA7S8lSi4cUEQTdXJ7OJ+YSE +MWe9bISIQnQeM23qjCGuwMvZIIfVlw= X-MC-Unique: WTUU5pOoM0OgTeL0BYdQPA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/2] error: Remove NULL checks on error_propagate() calls (again) Date: Fri, 9 Oct 2020 08:48:57 +0200 Message-Id: <20201009064858.323624-2-armbru@redhat.com> In-Reply-To: <20201009064858.323624-1-armbru@redhat.com> References: <20201009064858.323624-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 02:34:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, Jens Freimann , Hailiang Zhang , Juan Quintela 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" Patch created mechanically by rerunning: $ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --use-gitgrep . Cc: Jens Freimann Cc: Hailiang Zhang Cc: Juan Quintela Signed-off-by: Markus Armbruster Message-Id: <20200722084048.1726105-4-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Jens Freimann --- hw/net/virtio-net.c | 8 ++------ migration/colo.c | 4 +--- migration/migration.c | 8 ++------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 7bf27b9db7..a160a9da9c 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -817,9 +817,7 @@ static void failover_add_primary(VirtIONet *n, Error **= errp) "sure primary device has parameter" " failover_pair_id=3D\n"); } - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } =20 static int is_my_primary(void *opaque, QemuOpts *opts, Error **errp) @@ -873,9 +871,7 @@ static DeviceState *virtio_connect_failover_devices(Vir= tIONet *n, n->primary_device_id =3D g_strdup(prim_dev->id); n->primary_device_opts =3D prim_dev->opts; } else { - if (err) { - error_propagate(errp, err); - } + error_propagate(errp, err); } =20 return prim_dev; diff --git a/migration/colo.c b/migration/colo.c index 80788d46b5..3f1d3dfd95 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -798,9 +798,7 @@ static void colo_incoming_process_checkpoint(MigrationI= ncomingState *mis, =20 colo_send_message(mis->to_src_file, COLO_MESSAGE_VMSTATE_LOADED, &local_err); - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); } =20 static void colo_wait_handle_message(MigrationIncomingState *mis, diff --git a/migration/migration.c b/migration/migration.c index aca7fdcd0b..0575ecb379 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -623,9 +623,7 @@ void migration_fd_process_incoming(QEMUFile *f, Error *= *errp) } =20 if (migration_incoming_setup(f, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } migration_incoming_process(); @@ -647,9 +645,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Er= ror **errp) } =20 if (migration_incoming_setup(f, &local_err)) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); return; } =20 --=20 2.26.2 From nobody Sun Nov 16 23:02:10 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=1602227342; cv=none; d=zohomail.com; s=zohoarc; b=XOtnAjSegWd5CLNH6d3bhouIQTOqIfZRUw8FfS+JNK3c45PzDQPwSTsdyePJ5aQO/yxymx6fAFlRSDLCWCDCAfeS+29vugUvUfeCZXlysxiLbp6UJJ18GQ01/h7n6zGj/wmndNJqzJLD5SKFboRO9R4GBesaRF4hDXAcUMDyu9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602227342; 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=OMrLk0g04u5nH4vC+xcSxbxkdfMz69tDaASLL1Fon74=; b=XJWXC56FfTEKw6KBwQKs1gx3Ux0r4Nai2P9U/lOiSpOl3FRyIKSOz+xqn4mLdVZUAIDUq5KtflSHTlQ8hN18FKhMs73+XJn+oN8wdOrORRlG3PJ3j3gRXAFLacwneH1lNbT3VJS9rZRlglKOL0XX6B9zUG0+Kvh4gNnCCp1g990= 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 1602227342019658.4366189102683; Fri, 9 Oct 2020 00:09:02 -0700 (PDT) Received: from localhost ([::1]:54398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQmWS-0000X0-O9 for importer@patchew.org; Fri, 09 Oct 2020 03:09:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQmDI-0000EN-Nd for qemu-devel@nongnu.org; Fri, 09 Oct 2020 02:49:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:39880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQmDG-0001aP-SI for qemu-devel@nongnu.org; Fri, 09 Oct 2020 02:49: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-226-eUmShL3cNm-84PKkPqjYog-1; Fri, 09 Oct 2020 02:49:06 -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 DE8F284A61C; Fri, 9 Oct 2020 06:49:05 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A94D7664F; Fri, 9 Oct 2020 06:49:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 99259112CE14; Fri, 9 Oct 2020 08:48:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602226148; 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=OMrLk0g04u5nH4vC+xcSxbxkdfMz69tDaASLL1Fon74=; b=V4BQJkpo7959CgQ3sC1UVR0chit1uSfLUezGelq61mBNcwkDjEkROMrws0RKsV1N6OK5i9 Ron9KeZdt1raMViRu85FzaNqtTEY25UG1GwRcY9EKU+rUF7QunnHWr948M3msaQXFkOEiV KuLky3su1oXcv2f5EYviUUKRwuK8z50= X-MC-Unique: eUmShL3cNm-84PKkPqjYog-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 2/2] error: Use error_fatal to simplify obvious fatal errors (again) Date: Fri, 9 Oct 2020 08:48:58 +0200 Message-Id: <20201009064858.323624-3-armbru@redhat.com> In-Reply-To: <20201009064858.323624-1-armbru@redhat.com> References: <20201009064858.323624-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 02:34:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: peter.maydell@linaro.org, David Hildenbrand , Eric Auger 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" Patch created mechanically by rerunning: $ spatch --in-place --sp-file scripts/coccinelle/use-error_fatal.cocci \ --macro-file scripts/cocci-macro-file.h --use-gitgrep . Variables now unused dropped manually. Cc: Eric Auger Cc: David Hildenbrand Signed-off-by: Markus Armbruster Message-Id: <20200722084048.1726105-5-armbru@redhat.com> Reviewed-by: David Hildenbrand --- exec.c | 11 +++-------- hw/s390x/s390-virtio-ccw.c | 7 +------ hw/virtio/vhost.c | 10 +++------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/exec.c b/exec.c index ec68f4a9ca..bca441f7fd 100644 --- a/exec.c +++ b/exec.c @@ -623,8 +623,7 @@ static void tcg_register_iommu_notifier(CPUState *cpu, */ MemoryRegion *mr =3D MEMORY_REGION(iommu_mr); TCGIOMMUNotifier *notifier; - Error *err =3D NULL; - int i, ret; + int i; =20 for (i =3D 0; i < cpu->iommu_notifiers->len; i++) { notifier =3D g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier = *, i); @@ -653,12 +652,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu, 0, HWADDR_MAX, iommu_idx); - ret =3D memory_region_register_iommu_notifier(notifier->mr, ¬if= ier->n, - &err); - if (ret) { - error_report_err(err); - exit(1); - } + memory_region_register_iommu_notifier(notifier->mr, ¬ifier->n, + &error_fatal); } =20 if (!notifier->active) { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 28266a3a35..e52182f946 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -161,7 +161,6 @@ static void virtio_ccw_register_hcalls(void) static void s390_memory_init(MemoryRegion *ram) { MemoryRegion *sysmem =3D get_system_memory(); - Error *local_err =3D NULL; =20 /* allocate RAM for core */ memory_region_add_subregion(sysmem, 0, ram); @@ -170,11 +169,7 @@ static void s390_memory_init(MemoryRegion *ram) * Configure the maximum page size. As no memory devices were created * yet, this is the page size of initial memory only. */ - s390_set_max_pagesize(qemu_maxrampagesize(), &local_err); - if (local_err) { - error_report_err(local_err); - exit(EXIT_FAILURE); - } + s390_set_max_pagesize(qemu_maxrampagesize(), &error_fatal); /* Initialize storage key device */ s390_skeys_init(); /* Initialize storage attributes device */ diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 68f0a75134..3077fa6ef5 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -712,9 +712,8 @@ static void vhost_iommu_region_add(MemoryListener *list= ener, iommu_listener); struct vhost_iommu *iommu; Int128 end; - int iommu_idx, ret; + int iommu_idx; IOMMUMemoryRegion *iommu_mr; - Error *err =3D NULL; =20 if (!memory_region_is_iommu(section->mr)) { return; @@ -737,11 +736,8 @@ static void vhost_iommu_region_add(MemoryListener *lis= tener, iommu->iommu_offset =3D section->offset_within_address_space - section->offset_within_region; iommu->hdev =3D dev; - ret =3D memory_region_register_iommu_notifier(section->mr, &iommu->n, = &err); - if (ret) { - error_report_err(err); - exit(1); - } + memory_region_register_iommu_notifier(section->mr, &iommu->n, + &error_fatal); QLIST_INSERT_HEAD(&dev->iommu_list, iommu, iommu_next); /* TODO: can replay help performance here? */ } --=20 2.26.2