OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/rtl8139: Clean up global variable shadowing

Browse Source 
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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231009100251.56019-7-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-09 12:02:47 +02:00 committed by Thomas Huth
parent e33ba60bdb
commit a186fedbef
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/qtest/rtl8139-test.c
View File

@ -22,7 +22,7 @@ static void nop(void)
#define CLK 33333333 #define CLK 33333333
static QPCIBus *pcibus; static QPCIBus *pcibus;
static QPCIDevice *dev; static QPCIDevice *pcidev;
static QPCIBar dev_bar; static QPCIBar dev_bar;
static void save_fn(QPCIDevice *dev, int devfn, void *data) static void save_fn(QPCIDevice *dev, int devfn, void *data)
@ -46,7 +46,7 @@ static QPCIDevice *get_device(void)
#define PORT(name, len, val) \ #define PORT(name, len, val) \
static unsigned __attribute__((unused)) in_##name(void) \ 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) { \ if (verbosity_level >= 2) { \
g_test_message("*%s -> %x", #name, res); \ g_test_message("*%s -> %x", #name, res); \
} \ } \
@ -57,7 +57,7 @@ static void out_##name(unsigned v) \
if (verbosity_level >= 2) { \ if (verbosity_level >= 2) { \
g_test_message("%x -> *%s", v, #name); \ 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) PORT(Timer, l, 0x48)
@ -189,11 +189,11 @@ static void test_init(void)
{ {
uint64_t barsize; 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(); test_timer();
} }