From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L4hDO-00057k-B3 for qemu-devel@nongnu.org; Mon, 24 Nov 2008 14:35:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L4hDN-00057O-RN for qemu-devel@nongnu.org; Mon, 24 Nov 2008 14:35:21 -0500 Received: from [199.232.76.173] (port=42951 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L4hDN-00057G-G5 for qemu-devel@nongnu.org; Mon, 24 Nov 2008 14:35:21 -0500 Received: from savannah.gnu.org ([199.232.41.3]:57609 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 ) id 1L4hDN-0001qP-7n for qemu-devel@nongnu.org; Mon, 24 Nov 2008 14:35:21 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L4hDM-0000Qd-Ky for qemu-devel@nongnu.org; Mon, 24 Nov 2008 19:35:20 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L4hDJ-0000QY-Q7 for qemu-devel@nongnu.org; Mon, 24 Nov 2008 19:35:18 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Mon, 24 Nov 2008 19:35:17 +0000 Subject: [Qemu-devel] [5791] move vga_io_address to VGA State (Glauber Costa) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5791 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5791 Author: aliguori Date: 2008-11-24 19:35:16 +0000 (Mon, 24 Nov 2008) Log Message: ----------- move vga_io_address to VGA State (Glauber Costa) It'll be reused later by the vga optimization. Signed-off-by: Glauber Costa Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/hw/cirrus_vga.c trunk/hw/vga_int.h Modified: trunk/hw/cirrus_vga.c =================================================================== --- trunk/hw/cirrus_vga.c 2008-11-24 19:33:59 UTC (rev 5790) +++ trunk/hw/cirrus_vga.c 2008-11-24 19:35:16 UTC (rev 5791) @@ -3117,7 +3117,7 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) { - int vga_io_memory, i; + int i; static int inited; if (!inited) { @@ -3156,10 +3156,10 @@ register_ioport_read(0x3ba, 1, 1, vga_ioport_read, s); register_ioport_read(0x3da, 1, 1, vga_ioport_read, s); - vga_io_memory = cpu_register_io_memory(0, cirrus_vga_mem_read, + s->vga_io_memory = cpu_register_io_memory(0, cirrus_vga_mem_read, cirrus_vga_mem_write, s); cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000, - vga_io_memory); + s->vga_io_memory); s->sr[0x06] = 0x0f; if (device_id == CIRRUS_ID_CLGD5446) { Modified: trunk/hw/vga_int.h =================================================================== --- trunk/hw/vga_int.h 2008-11-24 19:33:59 UTC (rev 5790) +++ trunk/hw/vga_int.h 2008-11-24 19:35:16 UTC (rev 5791) @@ -129,6 +129,7 @@ int dac_8bit; \ uint8_t palette[768]; \ int32_t bank_offset; \ + int vga_io_memory; \ int (*get_bpp)(struct VGAState *s); \ void (*get_offsets)(struct VGAState *s, \ uint32_t *pline_offset, \