commit 6f9bc132639d8d3349581441daa4f799c28d48fb
author balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Apr 12 23:49:37 2008 +0000
committer balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Apr 12 23:49:37 2008 +0000
tree 1f6e3aae9f38a727c1654dc1832dc508b7a5692c
parent f54b3f920f12fb4fb41e259f793a853860a7d2ec

Allocate the -vmwarevga framebuffer in the right place in RAM.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4200 c046a42c-6fe2-441c-8c8c-71466251a162

hw/vmware_vga.c

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 5536105..2f9b15c 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -58,6 +58,7 @@
 #ifndef EMBED_STDVGA
     DisplayState *ds;
     int vram_size;
+    ram_addr_t vram_offset;
 #endif
     uint8_t *vram;
     target_phys_addr_t vram_base;
@@ -1114,6 +1115,7 @@
     s->ds = ds;
     s->vram = vga_ram_base;
     s->vram_size = vga_ram_size;
+    s->vram_offset = vga_ram_offset;
 
     s->scratch_size = SVGA_SCRATCH_SIZE;
     s->scratch = (uint32_t *) qemu_malloc(s->scratch_size * 4);
@@ -1186,7 +1188,7 @@
     iomemtype = cpu_register_io_memory(0, vmsvga_vram_read,
                     vmsvga_vram_write, s);
 #else
-    iomemtype = 0 | IO_MEM_RAM;
+    iomemtype = s->vram_offset | IO_MEM_RAM;
 #endif
     cpu_register_physical_memory(s->vram_base, s->vram_size,
                     iomemtype);