[Qemu-devel] [RFC 4/6] vga: use isa_address_space() method

[Hervé Poussineau]

Signed-off-by: Hervé Poussineau <address@hidden>
---
 hw/cirrus_vga.c |    4 ++--
 hw/vga-isa.c    |    4 ++--
 hw/vga.c        |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index b489309..ebc4aec 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2856,8 +2856,8 @@ static void cirrus_init_common(CirrusVGAState * s, int 
device_id, int is_pci)
     memory_region_init_io(&s->low_mem, &cirrus_vga_mem_ops, s,
                           "cirrus-low-memory", 0x20000);
     memory_region_add_subregion(&s->low_mem_container, 0, &s->low_mem);
-    memory_region_add_subregion_overlap(get_system_memory(),
-                                        isa_mem_base + 0x000a0000,
+    memory_region_add_subregion_overlap(isa_address_space(),
+                                        0x000a0000,
                                         &s->low_mem_container,
                                         1);
     memory_region_set_coalescing(&s->low_mem);
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index fef7f58..bbbf643 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -51,8 +51,8 @@ static int vga_initfn(ISADevice *dev)
 
     vga_common_init(s, VGA_RAM_SIZE);
     vga_io_memory = vga_init_io(s);
-    memory_region_add_subregion_overlap(get_system_memory(),
-                                        isa_mem_base + 0x000a0000,
+    memory_region_add_subregion_overlap(isa_address_space(),
+                                        0x000a0000,
                                         vga_io_memory, 1);
     memory_region_set_coalescing(vga_io_memory);
     isa_init_ioport(dev, 0x3c0);
diff --git a/hw/vga.c b/hw/vga.c
index 33dc478..0d4b5c2 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2250,8 +2250,8 @@ void vga_init(VGACommonState *s)
     s->bank_offset = 0;
 
     vga_io_memory = vga_init_io(s);
-    memory_region_add_subregion_overlap(get_system_memory(),
-                                        isa_mem_base + 0x000a0000,
+    memory_region_add_subregion_overlap(isa_address_space(),
+                                        0x000a0000,
                                         vga_io_memory,
                                         1);
     memory_region_set_coalescing(vga_io_memory);
-- 
1.7.5.4