Commit e93a5f4f9aefbd070535f03d8977eafa4e35b2aa
1 parent
0d31cb99
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
Showing
1 changed file
with
5 additions
and
5 deletions
hw/vmware_vga.c
| @@ -1123,16 +1123,16 @@ static void vmsvga_init(struct vmsvga_state_s *s, DisplayState *ds, | @@ -1123,16 +1123,16 @@ static void vmsvga_init(struct vmsvga_state_s *s, DisplayState *ds, | ||
| 1123 | 1123 | ||
| 1124 | vmsvga_reset(s); | 1124 | vmsvga_reset(s); |
| 1125 | 1125 | ||
| 1126 | - s->console = graphic_console_init(ds, vmsvga_update_display, | ||
| 1127 | - vmsvga_invalidate_display, | ||
| 1128 | - vmsvga_screen_dump, | ||
| 1129 | - vmsvga_text_update, s); | ||
| 1130 | - | ||
| 1131 | #ifdef EMBED_STDVGA | 1126 | #ifdef EMBED_STDVGA |
| 1132 | vga_common_init((VGAState *) s, ds, | 1127 | vga_common_init((VGAState *) s, ds, |
| 1133 | vga_ram_base, vga_ram_offset, vga_ram_size); | 1128 | vga_ram_base, vga_ram_offset, vga_ram_size); |
| 1134 | vga_init((VGAState *) s); | 1129 | vga_init((VGAState *) s); |
| 1135 | #endif | 1130 | #endif |
| 1131 | + | ||
| 1132 | + s->console = graphic_console_init(ds, vmsvga_update_display, | ||
| 1133 | + vmsvga_invalidate_display, | ||
| 1134 | + vmsvga_screen_dump, | ||
| 1135 | + vmsvga_text_update, s); | ||
| 1136 | } | 1136 | } |
| 1137 | 1137 | ||
| 1138 | static void pci_vmsvga_save(QEMUFile *f, void *opaque) | 1138 | static void pci_vmsvga_save(QEMUFile *f, void *opaque) |