From: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 16 Jul 2008 04:31:20 +0000 (+0000)
Subject: Initialize the VMware VGA console after vga_init (Alexander Graf).
X-Git-Tag: 0.10.0-0maemo1~1472
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=e93a5f4f9aefbd070535f03d8977eafa4e35b2aa;p=qemu

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

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 25c7915..1288296 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)