[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/10] tests/rtl8139: Clean up global variable shadowing
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 06/10] tests/rtl8139: Clean up global variable shadowing |
Date: |
Mon, 9 Oct 2023 12:02:47 +0200 |
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
- Re: [PATCH 01/10] system/qtest: Clean up global variable shadowing in qtest_server_init(), (continued)
- [PATCH 02/10] tests/throttle: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 03/10] tests/virtio-scsi: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 04/10] tests/cdrom-test: Clean up global variable shadowing in prepare_image(), Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 07/10] tests/npcm7xx_adc: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 06/10] tests/rtl8139: Clean up global variable shadowing,
Philippe Mathieu-Daudé <=
- [PATCH 05/10] tests/hd-geo-test: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 08/10] tests/aio: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 10/10] tests/coroutine: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- [PATCH 09/10] tests/aio-multithread: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/10/09
- Re: [PATCH 00/10] tests: Clean up global variables shadowing, Thomas Huth, 2023/10/27