Take text_update argument to graphic_console_init, although we do not use it at the...

diff --git a/console.c b/console.c
index 01636c4b32e08a1ce69119bd4a46cc551b01c05d..f2bf4e02c51d3060b2fa094757acef16ea83b370 100644 (file)
--- a/console.c
+++ b/console.c
@@ -1135,6 +1135,7 @@ static TextConsole *new_console(DisplayState *ds, int text)
 TextConsole *graphic_console_init(DisplayState *ds, vga_hw_update_ptr update,
                                   vga_hw_invalidate_ptr invalidate,
                                   vga_hw_screen_dump_ptr screen_dump,
+                                  vga_hw_text_update_ptr text_update,
                                   void *opaque)
 {
     TextConsole *s;

diff --git a/console.h b/console.h
index 1ac74fad3f3cf51aade6d913d838502aca04eb94..66e4f0e2ca55272488e614a4ad5807366633d3bf 100644 (file)
--- a/console.h
+++ b/console.h
@@ -97,17 +97,19 @@ static inline void dpy_resize(DisplayState *s, int w, int h)
 typedef void (*vga_hw_update_ptr)(void *);
 typedef void (*vga_hw_invalidate_ptr)(void *);
 typedef void (*vga_hw_screen_dump_ptr)(void *, const char *);
+typedef void (*vga_hw_text_update_ptr)(void *, console_ch_t *);
 
 TextConsole *graphic_console_init(DisplayState *ds, vga_hw_update_ptr update,
                                   vga_hw_invalidate_ptr invalidate,
                                   vga_hw_screen_dump_ptr screen_dump,
+                                  vga_hw_text_update_ptr text_update,
                                   void *opaque);
 void vga_hw_update(void);
 void vga_hw_invalidate(void);
 void vga_hw_screen_dump(const char *filename);
 
 int is_graphic_console(void);
-CharDriverState *text_console_init(DisplayState *ds, const char *p);
+CharDriverState *text_console_init(DisplayState *ds);
 void console_select(unsigned int index);
 void console_color_init(DisplayState *ds);