From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JkpTb-0006SY-TN
	for qemu-devel@nongnu.org; Sat, 12 Apr 2008 19:49:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JkpTb-0006SG-C9
	for qemu-devel@nongnu.org; Sat, 12 Apr 2008 19:49:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JkpTb-0006SB-8T
	for qemu-devel@nongnu.org; Sat, 12 Apr 2008 19:49:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <balrogg@gmail.com>) id 1JkpTa-0000iB-UX
	for qemu-devel@nongnu.org; Sat, 12 Apr 2008 19:49:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <balrogg@gmail.com>) id 1JkpTW-0001Sg-Va
	for qemu-devel@nongnu.org; Sat, 12 Apr 2008 23:49:39 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1JkpTW-0001Sc-Mr
	for qemu-devel@nongnu.org; Sat, 12 Apr 2008 23:49:38 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1JkpTW-0001Sc-Mr@cvs.savannah.gnu.org>
Date: Sat, 12 Apr 2008 23:49:38 +0000
Subject: [Qemu-devel] [4200] Allocate the -vmwarevga framebuffer in the
	right place in RAM.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4200
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4200
Author:   balrog
Date:     2008-04-12 23:49:37 +0000 (Sat, 12 Apr 2008)

Log Message:
-----------
Allocate the -vmwarevga framebuffer in the right place in RAM.

Modified Paths:
--------------
    trunk/hw/vmware_vga.c

Modified: trunk/hw/vmware_vga.c
===================================================================
--- trunk/hw/vmware_vga.c	2008-04-12 20:14:54 UTC (rev 4199)
+++ trunk/hw/vmware_vga.c	2008-04-12 23:49:37 UTC (rev 4200)
@@ -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);