diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-24 19:35:16 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-24 19:35:16 +0000 |
| commit | 9b851006cbdbd91fd22be08e51629feb8723a767 (patch) | |
| tree | 0760bd547e702d64f2b30482c9304a347463f289 /hw/cirrus_vga.c | |
| parent | a03b274386cc0f9cdc880b0e2a53b9ed2da45e20 (diff) | |
| download | qemu-9b851006cbdbd91fd22be08e51629feb8723a767.tar.gz qemu-9b851006cbdbd91fd22be08e51629feb8723a767.tar.bz2 qemu-9b851006cbdbd91fd22be08e51629feb8723a767.zip | |
move vga_io_address to VGA State (Glauber Costa)
It'll be reused later by the vga optimization.
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5791 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/cirrus_vga.c')
| -rw-r--r-- | hw/cirrus_vga.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 22f9075720..01f3b6a631 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3117,7 +3117,7 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id) 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 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) 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) { |