[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6369] Remove dumb_display (Stefan Stabellini)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6369] Remove dumb_display (Stefan Stabellini) |
Date: |
Mon, 19 Jan 2009 16:34:11 +0000 |
Revision: 6369
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6369
Author: aliguori
Date: 2009-01-19 16:34:10 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
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 <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/vl.c
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2009-01-18 20:56:30 UTC (rev 6368)
+++ trunk/vl.c 2009-01-19 16:34:10 UTC (rev 6369)
@@ -2775,27 +2775,12 @@
/* dumb display */
-static void dumb_update(DisplayState *ds, int x, int y, int w, int h)
+static void dumb_display_init(void)
{
+ DisplayState *ds = qemu_mallocz(sizeof(DisplayState));
+ register_displaystate(ds);
}
-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);
-}
-
/***********************************************************/
/* I/O handling */
@@ -5535,6 +5520,8 @@
}
}
+ if (!display_state)
+ dumb_display_init();
/* just use the first displaystate for the moment */
ds = display_state;
/* terminal init */
@@ -5543,8 +5530,6 @@
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 @@
sdl_display_init(ds, full_screen, no_frame);
#elif defined(CONFIG_COCOA)
cocoa_display_init(ds, full_screen);
-#else
- dumb_display_init(ds);
#endif
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6369] Remove dumb_display (Stefan Stabellini),
Anthony Liguori <=