Merge tag 'pull-shadow-2023-10-12' of https://repo.or.cz/qemu/armbru into staging

-Wshadow=local patches for 2023-10-12

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmUoCNsSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTTocP/iQ6RggqcHrBxwZZtyydvpWCFrqfuBTk
# 6GQtKGm51UcQ9kmAIsoV90pOzdUdjwrpXzKKJwsLzMcVcp1NDPsQIL54wdsRmZfH
# E9mxI7UlZf/KWzrfP1nFLcU8T5+cuXosDgjx55Y1Kq+ZRn+7x0DInBGdRryokWTG
# zcKh9T3n9KWKscLL7hvxLZS5054V9HBDYIpBBEyV2GtRrCLL0Y+9aaKkBrejHMgY
# oKrLKHz1cOGOTzQ7AbhA+Wv3eN+GYVyjnCSUXK/270jbU8Xg4m1vSbrPq2PWy5kV
# IGGKZtZsrSq0VBoTi+i9++vP5djKVUYQLqx10L+NYCp25wBnTgXKSDtdAqI68aev
# TYrOlQ1ldKXJT4ghPqoWCjRKkryV6/Gj9fHbbvsHJ7SB84VO8G/kpn5zXvN/BosG
# 8vxLEL0xc1Q3Sxi91DCjVsP7UebjBt1j/JugU9zVr8OFJWriFmllYB67AOOo3gS2
# c+FNVPLle3udw5EHClMapcGSzTun4iHeEsiJMOOgGOHC09Bi+Om6LlneFWljmvQp
# a6ma+bebxCjzuO6heey2Q/1JjltR8Ex0bnbWIoNsysA6OnDtTlbxDqZEca1h6As+
# Rm9XFKf7nVQIHFKW3sjbx6MgqAL6sBakfeJah5Pj5iIKtLaZR591RyAfvfB2sBlS
# ZYtp95GIKWXZ
# =AArx
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 12 Oct 2023 10:55:23 EDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-shadow-2023-10-12' of https://repo.or.cz/qemu/armbru:
  target/i386: fix shadowed variable pasto
  contrib/vhost-user-gpu: Fix compiler warning when compiling with -Wshadow
  hw/virtio/virtio-gpu: Fix compiler warning when compiling with -Wshadow
  libvhost-user: Fix compiler warning with -Wshadow=local
  libvduse: Fix compiler warning with -Wshadow=local

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --combined subprojects/libvhost-user/libvhost-user.c
index ac6d5d01d3a0a18dd2747a6e6584c4b97e4f00d4,ea2822a44cf809f986eab747c16b558e5a95164e..6684057370d9429b11afcace455f3eeed10770a2
--- 1/subprojects/libvhost-user/libvhost-user.c
--- 2/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@@ -631,9 -631,9 +631,9 @@@ static boo
  generate_faults(VuDev *dev) {
      unsigned int i;
      for (i = 0; i < dev->nregions; i++) {
 +#ifdef UFFDIO_REGISTER
          VuDevRegion *dev_region = &dev->regions[i];
          int ret;
 -#ifdef UFFDIO_REGISTER
          struct uffdio_register reg_struct;
  
          /*
@@@ -870,10 -870,10 +870,10 @@@ vu_rem_mem_reg(VuDev *dev, VhostUserMs
      for (i = 0; i < dev->nregions; i++) {
          if (reg_equal(&dev->regions[i], msg_region)) {
              VuDevRegion *r = &dev->regions[i];
-             void *m = (void *) (uintptr_t) r->mmap_addr;
+             void *ma = (void *) (uintptr_t) r->mmap_addr;
  
-             if (m) {
-                 munmap(m, r->size + r->mmap_offset);
+             if (ma) {
+                 munmap(ma, r->size + r->mmap_offset);
              }
  
              /*
@@@ -1005,10 -1005,10 +1005,10 @@@ vu_set_mem_table_exec(VuDev *dev, Vhost
  
      for (i = 0; i < dev->nregions; i++) {
          VuDevRegion *r = &dev->regions[i];
-         void *m = (void *) (uintptr_t) r->mmap_addr;
+         void *ma = (void *) (uintptr_t) r->mmap_addr;
  
-         if (m) {
-             munmap(m, r->size + r->mmap_offset);
+         if (ma) {
+             munmap(ma, r->size + r->mmap_offset);
          }
      }
      dev->nregions = memory->nregions;