[PULL 00/56] -Wshadow=local patches patches for 2023-09-29

Markus Armbruster posted 56 patches 7 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230929085053.2789105-1-armbru@redhat.com
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>, John Snow <jsnow@redhat.com>, Ilya Dryomov <idryomov@gmail.com>, Peter Lieven <pl@kamp.de>, Stefan Weil <sw@weilnetz.de>, "Daniel P. Berrangé" <berrange@redhat.com>, Laurent Vivier <laurent@vivier.eu>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Beniamino Galvani <b.galvani@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, Andrew Jeffery <andrew@aj.id.au>, Joel Stanley <joel@jms.id.au>, Eric Auger <eric.auger@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Peter Xu <peterx@redhat.com>, Jason Wang <jasowang@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Chris Wulff <crwulff@gmail.com>, Marek Vasut <marex@denx.de>, Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>, Nicholas Piggin <npiggin@gmail.com>, "Frédéric Barrat" <fbarrat@linux.ibm.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Alistair Francis <Alistair.Francis@wdc.com>, Palmer Dabbelt <palmer@dabbelt.com>, Bin Meng <bin.meng@windriver.com>, Weiwei Li <liweiwei@iscas.ac.cn>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Markus Armbruster <armbru@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, Juan Quintela <quintela@redhat.com>, Leonardo Bras <leobras@redhat.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Akihiko Odaki <akihiko.odaki@daynix.com>, David Hildenbrand <david@redhat.com>, Alexander Graf <agraf@csgraf.de>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Alberto Garcia <berto@igalia.com>, Gerd Hoffmann <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Coiby Xu <Coiby.Xu@gmail.com>
hw/arm/smmuv3-internal.h                 | 41 ++++++++++---------------------
hw/m68k/bootinfo.h                       | 10 +++-----
include/hw/ppc/fdt.h                     |  8 +++---
include/qapi/qmp/qobject.h               | 10 ++++++--
include/qemu/atomic.h                    | 17 +++++++++----
include/qemu/compiler.h                  |  3 +++
include/qemu/osdep.h                     | 27 ++++++++++++++------
include/sysemu/device_tree.h             |  6 ++---
accel/tcg/tb-maint.c                     |  3 +--
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 +++++++++++++-------------
crypto/tls-cipher-suites.c               |  1 -
disas/m68k.c                             |  8 +++---
hw/acpi/cpu_hotplug.c                    | 25 ++++++++++---------
hw/arm/allwinner-r40.c                   |  7 +++---
hw/arm/armsse.c                          | 16 +++++-------
hw/arm/armv7m.c                          |  2 +-
hw/arm/aspeed_ast2600.c                  | 10 ++++----
hw/arm/smmuv3.c                          |  4 +--
hw/arm/virt.c                            |  3 +--
hw/block/xen-block.c                     |  6 ++---
hw/core/machine.c                        |  2 --
hw/i2c/aspeed_i2c.c                      |  1 -
hw/i386/acpi-build.c                     | 24 +++++++++---------
hw/i386/intel_iommu.c                    |  8 +++---
hw/intc/arm_gicv3_its.c                  |  6 ++---
hw/intc/openpic.c                        |  7 ++----
hw/microblaze/petalogix_ml605_mmu.c      |  2 +-
hw/misc/arm_sysctl.c                     |  6 ++---
hw/misc/aspeed_i3c.c                     |  6 ++---
hw/nios2/10m50_devboard.c                |  4 +--
hw/nvme/ns.c                             |  4 +--
hw/ppc/pnv_psi.c                         |  5 ++--
hw/ppc/spapr.c                           | 42 +++++++++++++++++---------------
hw/ppc/spapr_drc.c                       | 12 ++++-----
hw/ppc/spapr_pci.c                       |  6 ++---
hw/riscv/opentitan.c                     |  2 +-
hw/smbios/smbios.c                       | 37 ++++++++++++++--------------
hw/timer/aspeed_timer.c                  |  2 +-
linux-user/strace.c                      |  1 -
migration/block.c                        |  4 +--
migration/ram.c                          |  8 +++---
migration/rdma.c                         | 14 +++++++----
migration/vmstate.c                      |  2 +-
net/eth.c                                |  2 --
qemu-nbd.c                               |  9 +++----
softmmu/device_tree.c                    |  6 ++---
softmmu/memory.c                         |  1 -
softmmu/physmem.c                        | 10 ++++----
softmmu/qemu-seccomp.c                   |  4 +--
target/arm/hvf/hvf.c                     |  8 +++---
target/arm/tcg/mve_helper.c              | 16 ++++++------
target/arm/tcg/translate-m-nocp.c        |  2 +-
target/m68k/translate.c                  |  2 +-
target/mips/tcg/msa_helper.c             |  8 +++---
target/mips/tcg/translate.c              |  8 +++---
target/riscv/cpu.c                       |  4 +--
target/riscv/vector_helper.c             |  7 +++---
target/tricore/translate.c               |  6 ++---
tcg/tcg.c                                | 16 ++++++------
tests/unit/test-throttle.c               |  2 +-
ui/gtk.c                                 | 14 +++++------
ui/spice-display.c                       |  9 ++++---
ui/vnc-palette.c                         |  2 --
ui/vnc.c                                 | 12 ++++-----
util/vhost-user-server.c                 |  2 +-
crypto/cipher-gnutls.c.inc               |  4 +--
target/mips/tcg/nanomips_translate.c.inc |  6 ++---
ui/vnc-enc-zrle.c.inc                    |  9 +++----
74 files changed, 326 insertions(+), 331 deletions(-)
[PULL 00/56] -Wshadow=local patches patches for 2023-09-29
Posted by Markus Armbruster 7 months ago
The following changes since commit 36e9aab3c569d4c9ad780473596e18479838d1aa:

  migration: Move return path cleanup to main migration thread (2023-09-27 13:58:02 -0400)

are available in the Git repository at:

  https://repo.or.cz/qemu/armbru.git tags/pull-shadow-2023-09-29

for you to fetch changes up to 4dba9141f97e66fdd920df37c4aa7b2ffe0d6a4a:

  disas/m68k: clean up local variable shadowing (2023-09-29 10:07:21 +0200)

----------------------------------------------------------------
-Wshadow=local patches patches for 2023-09-29

----------------------------------------------------------------
Alberto Garcia (1):
      test-throttle: don't shadow 'index' variable in do_test_accounting()

Alistair Francis (4):
      hw/riscv: opentitan: Fixup local variables shadowing
      target/riscv: cpu: Fixup local variables shadowing
      target/riscv: vector_helper: Fixup local variables shadowing
      softmmu/device_tree: Fixup local variables shadowing

Ani Sinha (1):
      hw/acpi: changes towards enabling -Wshadow=local

Cédric Le Goater (12):
      hw/ppc: Clean up local variable shadowing in _FDT helper routine
      pnv/psi: Clean up local variable shadowing
      spapr: Clean up local variable shadowing in spapr_dt_cpus()
      spapr: Clean up local variable shadowing in spapr_init_cpus()
      spapr: Clean up local variable shadowing in spapr_get_fw_dev_path()
      spapr/drc: Clean up local variable shadowing in rtas_ibm_configure_connector()
      spapr/pci: Clean up local variable shadowing in spapr_phb_realize()
      spapr/drc: Clean up local variable shadowing in prop_get_fdt()
      aspeed/i2c: Clean up local variable shadowing
      aspeed: Clean up local variable shadowing
      aspeed/i3c: Rename variable shadowing a local
      aspeed/timer: Clean up local variable shadowing

Daniel P. Berrangé (2):
      crypto: remove shadowed 'ret' variable
      seccomp: avoid shadowing of 'action' variable

Eric Blake (1):
      qemu-nbd: changes towards enabling -Wshadow=local

Klaus Jensen (1):
      hw/nvme: Clean up local variable shadowing in nvme_ns_init()

Laurent Vivier (1):
      disas/m68k: clean up local variable shadowing

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

Peter Maydell (4):
      hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd()
      hw/misc/arm_sysctl.c: Avoid shadowing local variable
      hw/arm/smmuv3.c: Avoid shadowing variable
      hw/arm/smmuv3-internal.h: Don't use locals in statement macros

Peter Xu (1):
      intel_iommu: Fix shadow local variables on "size"

Philippe Mathieu-Daudé (21):
      tcg: Clean up local variable shadowing
      target/arm/tcg: Clean up local variable shadowing
      target/arm/hvf: Clean up local variable shadowing
      target/mips: Clean up local variable shadowing
      target/m68k: Clean up local variable shadowing
      target/tricore: Clean up local variable shadowing
      hw/arm/armv7m: Clean up local variable shadowing
      hw/arm/virt: Clean up local variable shadowing
      hw/arm/allwinner: Clean up local variable shadowing
      hw/m68k: Clean up local variable shadowing
      hw/microblaze: Clean up local variable shadowing
      hw/nios2: Clean up local variable shadowing
      net/eth: Clean up local variable shadowing
      crypto/cipher-gnutls.c: Clean up local variable shadowing
      util/vhost-user-server: Clean up local variable shadowing
      linux-user/strace: Clean up local variable shadowing
      sysemu/device_tree: Clean up local variable shadowing
      softmmu/memory: Clean up local variable shadowing
      softmmu/physmem: Clean up local variable shadowing
      hw/core/machine: Clean up local variable shadowing
      hw/intc/openpic: Clean up local variable shadowing

 hw/arm/smmuv3-internal.h                 | 41 ++++++++++---------------------
 hw/m68k/bootinfo.h                       | 10 +++-----
 include/hw/ppc/fdt.h                     |  8 +++---
 include/qapi/qmp/qobject.h               | 10 ++++++--
 include/qemu/atomic.h                    | 17 +++++++++----
 include/qemu/compiler.h                  |  3 +++
 include/qemu/osdep.h                     | 27 ++++++++++++++------
 include/sysemu/device_tree.h             |  6 ++---
 accel/tcg/tb-maint.c                     |  3 +--
 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 +++++++++++++-------------
 crypto/tls-cipher-suites.c               |  1 -
 disas/m68k.c                             |  8 +++---
 hw/acpi/cpu_hotplug.c                    | 25 ++++++++++---------
 hw/arm/allwinner-r40.c                   |  7 +++---
 hw/arm/armsse.c                          | 16 +++++-------
 hw/arm/armv7m.c                          |  2 +-
 hw/arm/aspeed_ast2600.c                  | 10 ++++----
 hw/arm/smmuv3.c                          |  4 +--
 hw/arm/virt.c                            |  3 +--
 hw/block/xen-block.c                     |  6 ++---
 hw/core/machine.c                        |  2 --
 hw/i2c/aspeed_i2c.c                      |  1 -
 hw/i386/acpi-build.c                     | 24 +++++++++---------
 hw/i386/intel_iommu.c                    |  8 +++---
 hw/intc/arm_gicv3_its.c                  |  6 ++---
 hw/intc/openpic.c                        |  7 ++----
 hw/microblaze/petalogix_ml605_mmu.c      |  2 +-
 hw/misc/arm_sysctl.c                     |  6 ++---
 hw/misc/aspeed_i3c.c                     |  6 ++---
 hw/nios2/10m50_devboard.c                |  4 +--
 hw/nvme/ns.c                             |  4 +--
 hw/ppc/pnv_psi.c                         |  5 ++--
 hw/ppc/spapr.c                           | 42 +++++++++++++++++---------------
 hw/ppc/spapr_drc.c                       | 12 ++++-----
 hw/ppc/spapr_pci.c                       |  6 ++---
 hw/riscv/opentitan.c                     |  2 +-
 hw/smbios/smbios.c                       | 37 ++++++++++++++--------------
 hw/timer/aspeed_timer.c                  |  2 +-
 linux-user/strace.c                      |  1 -
 migration/block.c                        |  4 +--
 migration/ram.c                          |  8 +++---
 migration/rdma.c                         | 14 +++++++----
 migration/vmstate.c                      |  2 +-
 net/eth.c                                |  2 --
 qemu-nbd.c                               |  9 +++----
 softmmu/device_tree.c                    |  6 ++---
 softmmu/memory.c                         |  1 -
 softmmu/physmem.c                        | 10 ++++----
 softmmu/qemu-seccomp.c                   |  4 +--
 target/arm/hvf/hvf.c                     |  8 +++---
 target/arm/tcg/mve_helper.c              | 16 ++++++------
 target/arm/tcg/translate-m-nocp.c        |  2 +-
 target/m68k/translate.c                  |  2 +-
 target/mips/tcg/msa_helper.c             |  8 +++---
 target/mips/tcg/translate.c              |  8 +++---
 target/riscv/cpu.c                       |  4 +--
 target/riscv/vector_helper.c             |  7 +++---
 target/tricore/translate.c               |  6 ++---
 tcg/tcg.c                                | 16 ++++++------
 tests/unit/test-throttle.c               |  2 +-
 ui/gtk.c                                 | 14 +++++------
 ui/spice-display.c                       |  9 ++++---
 ui/vnc-palette.c                         |  2 --
 ui/vnc.c                                 | 12 ++++-----
 util/vhost-user-server.c                 |  2 +-
 crypto/cipher-gnutls.c.inc               |  4 +--
 target/mips/tcg/nanomips_translate.c.inc |  6 ++---
 ui/vnc-enc-zrle.c.inc                    |  9 +++----
 74 files changed, 326 insertions(+), 331 deletions(-)

-- 
2.41.0


Re: [PULL 00/56] -Wshadow=local patches patches for 2023-09-29
Posted by Stefan Hajnoczi 7 months ago
Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.