Re: [PATCH 06/10] tests/rtl8139: Clean up global variable shadowing

2023-10-12 Thread Thomas Huth 

On 09/10/2023 12.02, Philippe Mathieu-Daudé wrote:

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é 
---
  tests/qtest/rtl8139-test.c | 12 ++--
  1 file changed, 6 insertions(+), 6 deletions(-)


Reviewed-by: Thomas Huth

[PATCH 06/10] tests/rtl8139: Clean up global variable shadowing

2023-10-09 Thread Philippe Mathieu-Daudé 
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é 
---
 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 
 
 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