OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

use lazy initialization for display_state 

Ensure initialization of a dumb display, if needed, by making
all accesses go through get_displaystate.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2010-02-11 00:29:55 +01:00 committed by Anthony Liguori
parent 9edf5051f3
commit b473df6e6a
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vl.c
View File

@ -2585,6 +2585,16 @@ struct DisplayAllocator default_allocator = {
defaultallocator_free_displaysurface
};
/* dumb display */
static void dumb_display_init(void)
{
DisplayState *ds = qemu_mallocz(sizeof(DisplayState));
ds->allocator = &default_allocator;
ds->surface = qemu_create_displaysurface(ds, 640, 480);
register_displaystate(ds);
}
void register_displaystate(DisplayState *ds)
{
DisplayState **s;
@ -2597,6 +2607,9 @@ void register_displaystate(DisplayState *ds)
DisplayState *get_displaystate(void)
{
if (!display_state) {
dumb_display_init();
}
return display_state;
}
@ -2606,16 +2619,6 @@ DisplayAllocator *register_displayallocator(DisplayState *ds, DisplayAllocator *
return ds->allocator;
}
/* dumb display */
static void dumb_display_init(void)
{
DisplayState *ds = qemu_mallocz(sizeof(DisplayState));
ds->allocator = &default_allocator;
ds->surface = qemu_create_displaysurface(ds, 640, 480);
register_displaystate(ds);
}
/***********************************************************/
/* I/O handling */
@ -5899,10 +5902,8 @@ int main(int argc, char **argv, char **envp)
net_check_clients();
if (!display_state)
dumb_display_init();
/* just use the first displaystate for the moment */
ds = display_state;
ds = get_displaystate();
if (display_type == DT_DEFAULT) {
#if defined(CONFIG_SDL) || defined(CONFIG_COCOA)
@ -5960,7 +5961,7 @@ int main(int argc, char **argv, char **envp)
qemu_mod_timer(nographic_timer, qemu_get_clock(rt_clock));
}
text_consoles_set_display(display_state);
text_consoles_set_display(ds);
if (qemu_opts_foreach(&qemu_mon_opts, mon_init_func, NULL, 1) != 0)
exit(1);