From nobody Tue May 14 20:31:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695234747; cv=none; d=zohomail.com; s=zohoarc; b=kv3dW73s6NzE2XVqnCLNLTag1FaiEovwuIZFqSHhFXBDS87DqU9Yo8lvbu56fdUBGHHPZ+o2/CTo1jwBQY7ILwUIRZ8vgmbFS9Aaf9tbPqyDUnH5m0zD0EVzhSs9FFpx1vTzkNp+WkFlsQ4LN7pd6jUzsMl7AXKb/W1EqdJIvLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695234747; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=xM3wAYFzQP3gxuYWUEVSWgPQWfxSd8/nVZzQqU4x75o=; b=SuEcPosZuW/mhVoXkySytDHBsJDAEFSOXzv1b1oVueo44ihd0LWMWP8ey+MQM+iOnKyCJXZjbzzjA4NOsQ/hyc3dAzgB+HV3+oz0XoQc/Fx+AxxNRH+3EEPhwnn5hTCg5PeI+BFwH7dUpTipXiKWQwmSo2ie2DPOZ+lryr2BVRQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1695234747116951.8724356414582; Wed, 20 Sep 2023 11:32:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.605891.943558 (Exim 4.92) (envelope-from ) id 1qj1zY-0000eC-FO; Wed, 20 Sep 2023 18:32:04 +0000 Received: by outflank-mailman (output) from mailman id 605891.943558; Wed, 20 Sep 2023 18:32:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qj1zY-0000cn-6f; Wed, 20 Sep 2023 18:32:04 +0000 Received: by outflank-mailman (input) for mailman id 605891; Wed, 20 Sep 2023 18:32:02 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qj1zV-0007WV-Vy for xen-devel@lists.xenproject.org; Wed, 20 Sep 2023 18:32:01 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id fc059d0c-57e3-11ee-9b0d-b553b5be7939; Wed, 20 Sep 2023 20:32:00 +0200 (CEST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-588-xMfiEogbMbSUk9DdrqY6Qw-1; Wed, 20 Sep 2023 14:31:52 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 54CE91C09A47; Wed, 20 Sep 2023 18:31:51 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5ECE2711282; Wed, 20 Sep 2023 18:31:50 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3207221E6900; Wed, 20 Sep 2023 20:31:49 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: fc059d0c-57e3-11ee-9b0d-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695234719; 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; bh=xM3wAYFzQP3gxuYWUEVSWgPQWfxSd8/nVZzQqU4x75o=; b=dKogQBXSULDZf12xC/TE84VsjhDPWSV3+ixJxIsNBtUDUHLbIte53WL/iJoAkKxbmgy8aJ vRfJeq79bsXc2EEX9p0vpQAtQkO+tG8nsOhareTPzeQwEcgWVvLuwOA8YT8AGxsmnI28AK 9u/dwjnQj6Hs3G1/RvGOmU8MCJcZZAk= X-MC-Unique: xMfiEogbMbSUk9DdrqY6Qw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, eblake@redhat.com, vsementsov@yandex-team.ru, jsnow@redhat.com, idryomov@gmail.com, pl@kamp.de, sw@weilnetz.de, sstabellini@kernel.org, anthony.perard@citrix.com, paul@xen.org, pbonzini@redhat.com, marcandre.lureau@redhat.com, berrange@redhat.com, thuth@redhat.com, philmd@linaro.org, stefanha@redhat.com, fam@euphon.net, quintela@redhat.com, peterx@redhat.com, leobras@redhat.com, kraxel@redhat.com, qemu-block@nongnu.org, xen-devel@lists.xenproject.org, alex.bennee@linaro.org, peter.maydell@linaro.org Subject: [PATCH v2 0/7] Steps towards enabling -Wshadow=local Date: Wed, 20 Sep 2023 20:31:42 +0200 Message-ID: <20230920183149.1105333-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695234749817100003 Content-Type: text/plain; charset="utf-8" Local variables shadowing other local variables or parameters make the code needlessly hard to understand. Bugs love to hide in such code. Evidence: PATCH 1. Enabling -Wshadow would prevent bugs like this one. But we'd have to clean up all the offenders first. We got a lot of them. Enabling -Wshadow=3Dlocal should be less work for almost as much gain. I took a stab at it. There's a small, exciting part, and a large, boring part. The exciting part is dark preprocessor sorcery to let us nest macro calls without shadowing: PATCH 7. The boring part is cleaning up all the other warnings. I did some [PATCH 2-6], but ran out of steam long before finishing the job. Some 160 unique warnings remain. To see them, enable -Wshadow=3Dlocal like so: diff --git a/meson.build b/meson.build index 98e68ef0b1..9fc4c7ac9d 100644 --- a/meson.build +++ b/meson.build @@ -466,6 +466,9 @@ warn_flags =3D [ '-Wno-tautological-type-limit-compare', '-Wno-psabi', '-Wno-gnu-variable-sized-type-not-at-end', + '-Wshadow=3Dlocal', + '-Wno-error=3Dshadow=3Dlocal', + '-Wno-error=3Dshadow=3Dcompatible-local', ] =20 if targetos !=3D 'darwin' You may want to drop the -Wno-error lines. v2: * PATCH 3+6: Mollify checkpatch * PATCH 4: Redo for clearer code, R-bys dropped [Kevin] * PATCH 5: Rename tweaked [Kevin] * PATCH 6: Rename local @tran instead of the parameter [Kevin] * PATCH 7: Drop PASTE(), use glue() instead [Richard]; pass identifiers instead of __COUNTER__ for readability [Eric]; add comments Markus Armbruster (7): migration/rdma: Fix save_page method to fail on polling error migration: Clean up local variable shadowing ui: Clean up local variable shadowing block/dirty-bitmap: Clean up local variable shadowing block/vdi: Clean up local variable shadowing block: Clean up local variable shadowing qobject atomics osdep: Make a few macros more hygienic include/qapi/qmp/qobject.h | 11 +++++++++-- include/qemu/atomic.h | 17 +++++++++++----- include/qemu/compiler.h | 3 +++ include/qemu/osdep.h | 31 +++++++++++++++++++++-------- block.c | 9 +++++---- block/monitor/bitmap-qmp-cmds.c | 19 +++++++++--------- block/qcow2-bitmap.c | 3 +-- block/rbd.c | 2 +- block/stream.c | 1 - block/vdi.c | 7 +++---- block/vvfat.c | 35 +++++++++++++++++---------------- hw/block/xen-block.c | 6 +++--- migration/block.c | 4 ++-- migration/ram.c | 8 +++----- migration/rdma.c | 14 ++++++++----- migration/vmstate.c | 2 +- ui/gtk.c | 14 ++++++------- ui/spice-display.c | 9 +++++---- ui/vnc-palette.c | 2 -- ui/vnc.c | 12 +++++------ ui/vnc-enc-zrle.c.inc | 9 ++++----- 21 files changed, 125 insertions(+), 93 deletions(-) --=20 2.41.0