[PATCH v2 3/6] hw/display/vga: Clean up global variable shadowing

[Philippe Mathieu-Daudé]

Rename 'address_space' -> 'legacy_io' and
'address_space_io' -> 'io' to 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 |  4 ++--
 hw/display/vga.c     | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index 7cf0d11201..0f5db522c2 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -157,8 +157,8 @@ 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,
-              MemoryRegion *address_space_io, bool init_vga_ports);
+void vga_init(VGACommonState *s, Object *obj,
+              MemoryRegion *legacy_io, MemoryRegion *io, bool init_vga_ports);
 MemoryRegion *vga_init_io(VGACommonState *s, Object *obj,
                           const MemoryRegionPortio **vga_ports,
                           const MemoryRegionPortio **vbe_ports);
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 37557c3442..4dc6535ae5 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2303,8 +2303,8 @@ MemoryRegion *vga_init_io(VGACommonState *s, Object *obj,
     return vga_mem;
 }
 
-void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space,
-              MemoryRegion *address_space_io, bool init_vga_ports)
+void vga_init(VGACommonState *s, Object *obj,
+              MemoryRegion *legacy_io, MemoryRegion *io, bool init_vga_ports)
 {
     MemoryRegion *vga_io_memory;
     const MemoryRegionPortio *vga_ports, *vbe_ports;
@@ -2313,10 +2313,10 @@ void vga_init(VGACommonState *s, Object *obj, 
MemoryRegion *address_space,
 
     s->bank_offset = 0;
 
-    s->legacy_address_space = address_space;
+    s->legacy_address_space = legacy_io;
 
     vga_io_memory = vga_init_io(s, obj, &vga_ports, &vbe_ports);
-    memory_region_add_subregion_overlap(address_space,
+    memory_region_add_subregion_overlap(legacy_io,
                                         0x000a0000,
                                         vga_io_memory,
                                         1);
@@ -2324,10 +2324,10 @@ void vga_init(VGACommonState *s, Object *obj, 
MemoryRegion *address_space,
     if (init_vga_ports) {
         portio_list_init(&s->vga_port_list, obj, vga_ports, s, "vga");
         portio_list_set_flush_coalesced(&s->vga_port_list);
-        portio_list_add(&s->vga_port_list, address_space_io, 0x3b0);
+        portio_list_add(&s->vga_port_list, io, 0x3b0);
     }
     if (vbe_ports) {
         portio_list_init(&s->vbe_port_list, obj, vbe_ports, s, "vbe");
-        portio_list_add(&s->vbe_port_list, address_space_io, 0x1ce);
+        portio_list_add(&s->vbe_port_list, io, 0x1ce);
     }
 }
-- 
2.41.0