aboutsummaryrefslogtreecommitdiff
path: root/hw/vga.c
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-02 01:10:46 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-02 01:10:46 +0000
commitd34cab9f49bc3ad83a2a968fc2d2719179db2c15 (patch)
treedee22397a6ebed7b22df70d95ee2730ef8a77b28 /hw/vga.c
parenta4080ece74523492856ac67e709a10675b080da0 (diff)
VMware SVGA II emulation, by Andrzej Zaborowski.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2579 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/vga.c')
-rw-r--r--hw/vga.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/hw/vga.c b/hw/vga.c
index 5acacf9b3d..2dadcca5b0 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1788,12 +1788,13 @@ void vga_common_init(VGAState *s, DisplayState *ds, uint8_t *vga_ram_base,
s->get_bpp = vga_get_bpp;
s->get_offsets = vga_get_offsets;
s->get_resolution = vga_get_resolution;
- graphic_console_init(s->ds, vga_update_display, vga_invalidate_display,
- vga_screen_dump, s);
+ s->update = vga_update_display;
+ s->invalidate = vga_invalidate_display;
+ s->screen_dump = vga_screen_dump;
}
/* used by both ISA and PCI */
-static void vga_init(VGAState *s)
+void vga_init(VGAState *s)
{
int vga_io_memory;
@@ -1856,6 +1857,8 @@ int isa_vga_init(DisplayState *ds, uint8_t *vga_ram_base,
vga_common_init(s, ds, vga_ram_base, vga_ram_offset, vga_ram_size);
vga_init(s);
+ graphic_console_init(s->ds, s->update, s->invalidate, s->screen_dump, s);
+
#ifdef CONFIG_BOCHS_VBE
/* XXX: use optimized standard vga accesses */
cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS,
@@ -1881,6 +1884,9 @@ int pci_vga_init(PCIBus *bus, DisplayState *ds, uint8_t *vga_ram_base,
vga_common_init(s, ds, vga_ram_base, vga_ram_offset, vga_ram_size);
vga_init(s);
+
+ graphic_console_init(s->ds, s->update, s->invalidate, s->screen_dump, s);
+
s->pci_dev = &d->dev;
pci_conf = d->dev.config;