From 8f391ab41ac02d6f7d94113161883f3ff92cc144 Mon Sep 17 00:00:00 2001 From: aliguori Date: Mon, 19 Jan 2009 16:34:10 +0000 Subject: [PATCH] Remove dumb_display (Stefan Stabellini) However I think the following fix is cleaner: we do not need a dumb_display_init that creates an empty DisplayChangeListener any more. We do need a dumb_display_init that allocates a zeroed DisplayState structure if none else does it. Tested-by: Shin-ichiro KAWASAKI Signed-off-by: Stefano Stabellini Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6369 c046a42c-6fe2-441c-8c8c-71466251a162 --- vl.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/vl.c b/vl.c index bfacdcf040..63d954bbcf 100644 --- a/vl.c +++ b/vl.c @@ -2775,25 +2775,10 @@ DisplayState *get_displaystate(void) /* dumb display */ -static void dumb_update(DisplayState *ds, int x, int y, int w, int h) +static void dumb_display_init(void) { -} - -static void dumb_resize(DisplayState *ds) -{ -} - -static void dumb_display_init(DisplayState *ds) -{ - DisplayChangeListener *dcl = qemu_mallocz(sizeof(DisplayChangeListener)); - if (!dcl) - exit(1); - dcl->dpy_update = dumb_update; - dcl->dpy_resize = dumb_resize; - dcl->dpy_refresh = NULL; - dcl->idle = 1; - dcl->gui_timer_interval = 500; - register_displaychangelistener(ds, dcl); + DisplayState *ds = qemu_mallocz(sizeof(DisplayState)); + register_displaystate(ds); } /***********************************************************/ @@ -5535,6 +5520,8 @@ int main(int argc, char **argv, char **envp) } } + if (!display_state) + dumb_display_init(); /* just use the first displaystate for the moment */ ds = display_state; /* terminal init */ @@ -5543,8 +5530,6 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "fatal: -nographic can't be used with -curses\n"); exit(1); } - /* nearly nothing to do */ - dumb_display_init(ds); } else { #if defined(CONFIG_CURSES) if (curses) { @@ -5563,8 +5548,6 @@ int main(int argc, char **argv, char **envp) sdl_display_init(ds, full_screen, no_frame); #elif defined(CONFIG_COCOA) cocoa_display_init(ds, full_screen); -#else - dumb_display_init(ds); #endif } }