On 09-Oct-2023, at 3:17 PM, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
Fix:
hw/display/vga.c:2307:29: error: declaration shadows a variable in the global
scope [-Werror,-Wshadow]
MemoryRegion *address_space_io, bool init_vga_ports)
^
include/exec/address-spaces.h:35:21: note: previous declaration is here
extern AddressSpace address_space_io;
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/display/vga_int.h | 2 +-
hw/display/vga.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index 7cf0d11201..94949d8a0c 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -157,7 +157,7 @@ static inline int c6_to_8(int v)
}
bool vga_common_init(VGACommonState *s, Object *obj, Error **errp);
-void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
+void vga_init(VGACommonState *s, Object *obj, MemoryRegion *io,
MemoryRegion *address_space_io, bool init_vga_ports);
Ok here you are replacing *address_space with *io but …
MemoryRegion *vga_init_io(VGACommonState *s, Object *obj,
const MemoryRegionPortio **vga_ports,
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 37557c3442..bb4cd240ec 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2304,7 +2304,7 @@ MemoryRegion *vga_init_io(VGACommonState *s, Object *obj,
}
void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
- MemoryRegion *address_space_io, bool init_vga_ports)
+ MemoryRegion *io, bool init_vga_ports)
Here you replace *address_space_io with *io? This does not look right.