aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-07-16 04:31:20 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-07-16 04:31:20 +0000
commite93a5f4f9aefbd070535f03d8977eafa4e35b2aa (patch)
tree641bf9326ee00bb30bf6ab82c61a1332b5b9c7be /hw
parent0d31cb9954bf864f7cf189d9a9198ff17e28a1c9 (diff)
Initialize the VMware VGA console after vga_init (Alexander Graf).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4871 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/vmware_vga.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 25c7915b4d..12882964c0 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -1123,16 +1123,16 @@ static void vmsvga_init(struct vmsvga_state_s *s, DisplayState *ds,
vmsvga_reset(s);
- s->console = graphic_console_init(ds, vmsvga_update_display,
- vmsvga_invalidate_display,
- vmsvga_screen_dump,
- vmsvga_text_update, s);
-
#ifdef EMBED_STDVGA
vga_common_init((VGAState *) s, ds,
vga_ram_base, vga_ram_offset, vga_ram_size);
vga_init((VGAState *) s);
#endif
+
+ s->console = graphic_console_init(ds, vmsvga_update_display,
+ vmsvga_invalidate_display,
+ vmsvga_screen_dump,
+ vmsvga_text_update, s);
}
static void pci_vmsvga_save(QEMUFile *f, void *opaque)