[Qemu-devel] [PATCH 08/14] Make VGA vram offset passed into vga_mm_init absolute. Since this is a function of the platform, it makes sense to have it be explicitly known in the platform layer rather than hardcoded inside the vga code.

[Zachary Amsden]

Signed-off-by: Zachary Amsden <address@hidden>
---
 hw/mips_jazz.c |    2 +-
 hw/vga.c       |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 2b4e1e0..0470a3f 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -200,7 +200,7 @@ void mips_jazz_init (ram_addr_t ram_size,
         g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]);
         break;
     case JAZZ_PICA61:
-        isa_vga_mm_init(0x40000000, 0x60000000, 0);
+        isa_vga_mm_init(0x400a0000, 0x60000000, 0);
         break;
     default:
         break;
diff --git a/hw/vga.c b/hw/vga.c
index 9b50959..52fb1c4 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2433,8 +2433,8 @@ static void vga_mm_init(VGAState *s, target_phys_addr_t 
vram_base,
     vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s);
 
     cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl);
-    cpu_register_physical_memory(vram_base + 0x000a0000, 0x20000, 
vga_io_memory);
-    qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000);
+    cpu_register_physical_memory(vram_base, 0x20000, vga_io_memory);
+    qemu_register_coalesced_mmio(vram_base, 0x20000);
 }
 
 int isa_vga_init(void)
-- 
1.6.2.5