qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, "Alberto Garcia" <berto@igalia.com>,
	"Hao Wu" <wuhaotsh@google.com>, "Kevin Wolf" <kwolf@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	qemu-block@nongnu.org, "John Snow" <jsnow@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Fam Zheng" <fam@euphon.net>, "Tyrone Ting" <kfting@nuvoton.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 06/10] tests/rtl8139: Clean up global variable shadowing
Date: Mon,  9 Oct 2023 12:02:47 +0200	[thread overview]
Message-ID: <20231009100251.56019-7-philmd@linaro.org> (raw)
In-Reply-To: <20231009100251.56019-1-philmd@linaro.org>

Rename the variable to fix:

  tests/qtest/rtl8139-test.c:28:33: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
  static void save_fn(QPCIDevice *dev, int devfn, void *data)
                                  ^
  tests/qtest/rtl8139-test.c:37:17: error: declaration shadows a variable in the global scope [-Werror,-Wshadow]
      QPCIDevice *dev;
                  ^
  tests/qtest/rtl8139-test.c:25:20: note: previous declaration is here
  static QPCIDevice *dev;
                     ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 tests/qtest/rtl8139-test.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
index 4dc0a0d22e..eedf90f65a 100644
--- a/tests/qtest/rtl8139-test.c
+++ b/tests/qtest/rtl8139-test.c
@@ -22,7 +22,7 @@ static void nop(void)
 #define CLK 33333333
 
 static QPCIBus *pcibus;
-static QPCIDevice *dev;
+static QPCIDevice *pcidev;
 static QPCIBar dev_bar;
 
 static void save_fn(QPCIDevice *dev, int devfn, void *data)
@@ -46,7 +46,7 @@ static QPCIDevice *get_device(void)
 #define PORT(name, len, val) \
 static unsigned __attribute__((unused)) in_##name(void) \
 { \
-    unsigned res = qpci_io_read##len(dev, dev_bar, (val));     \
+    unsigned res = qpci_io_read##len(pcidev, dev_bar, (val));     \
     if (verbosity_level >= 2) { \
         g_test_message("*%s -> %x", #name, res); \
     } \
@@ -57,7 +57,7 @@ static void out_##name(unsigned v) \
     if (verbosity_level >= 2) { \
         g_test_message("%x -> *%s", v, #name); \
     } \
-    qpci_io_write##len(dev, dev_bar, (val), v);        \
+    qpci_io_write##len(pcidev, dev_bar, (val), v);        \
 }
 
 PORT(Timer, l, 0x48)
@@ -189,11 +189,11 @@ static void test_init(void)
 {
     uint64_t barsize;
 
-    dev = get_device();
+    pcidev = get_device();
 
-    dev_bar = qpci_iomap(dev, 0, &barsize);
+    dev_bar = qpci_iomap(pcidev, 0, &barsize);
 
-    qpci_device_enable(dev);
+    qpci_device_enable(pcidev);
 
     test_timer();
 }
-- 
2.41.0



  parent reply	other threads:[~2023-10-09 10:04 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-09 10:02 [PATCH 00/10] tests: Clean up global variables shadowing Philippe Mathieu-Daudé
2023-10-09 10:02 ` [PATCH 01/10] system/qtest: Clean up global variable shadowing in qtest_server_init() Philippe Mathieu-Daudé
2023-10-13  5:56   ` Thomas Huth
2023-10-09 10:02 ` [PATCH 02/10] tests/throttle: Clean up global variable shadowing Philippe Mathieu-Daudé
2023-10-09 10:10   ` Alberto Garcia
2023-10-09 10:02 ` [PATCH 03/10] tests/virtio-scsi: " Philippe Mathieu-Daudé
2023-10-13  5:57   ` Thomas Huth
2023-10-13  7:24   ` Manos Pitsidianakis
2023-10-09 10:02 ` [PATCH 04/10] tests/cdrom-test: Clean up global variable shadowing in prepare_image() Philippe Mathieu-Daudé
2023-10-12 20:46   ` John Snow
2023-10-09 10:02 ` [PATCH 05/10] tests/hd-geo-test: Clean up global variable shadowing Philippe Mathieu-Daudé
2023-10-09 10:06   ` Philippe Mathieu-Daudé
2023-10-09 10:02 ` Philippe Mathieu-Daudé [this message]
2023-10-13  6:14   ` [PATCH 06/10] tests/rtl8139: " Thomas Huth
2023-10-09 10:02 ` [PATCH 07/10] tests/npcm7xx_adc: " Philippe Mathieu-Daudé
2023-10-13  6:15   ` Thomas Huth
2023-10-09 10:02 ` [PATCH 08/10] tests/aio: " Philippe Mathieu-Daudé
2023-10-13  6:24   ` Thomas Huth
2023-10-09 10:02 ` [PATCH 09/10] tests/aio-multithread: " Philippe Mathieu-Daudé
2023-10-13  6:26   ` Thomas Huth
2023-10-09 10:02 ` [PATCH 10/10] tests/coroutine: " Philippe Mathieu-Daudé
2023-10-13  6:27   ` Thomas Huth
2023-10-27  7:39 ` [PATCH 00/10] tests: Clean up global variables shadowing Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231009100251.56019-7-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=armbru@redhat.com \
    --cc=berto@igalia.com \
    --cc=fam@euphon.net \
    --cc=jsnow@redhat.com \
    --cc=kfting@nuvoton.com \
    --cc=kwolf@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=wuhaotsh@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).