[Qemu-devel] [5791] move vga_io_address to VGA State (Glauber Costa)

[Anthony Liguori]

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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

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,                         \