sdl2: move opts assignment into loop

So the opts pointer is set for all sdl2_consoles.

Fixes: 844fd50dbbcfc9e401895274bf4fb8da8e8d3f64
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2018-05-15 07:45:01 +02:00
parent fbd3a489df
commit f88e5c5744

View File

@ -804,7 +804,6 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
return; return;
} }
sdl2_console = g_new0(struct sdl2_console, sdl2_num_outputs); sdl2_console = g_new0(struct sdl2_console, sdl2_num_outputs);
sdl2_console->opts = o;
for (i = 0; i < sdl2_num_outputs; i++) { for (i = 0; i < sdl2_num_outputs; i++) {
QemuConsole *con = qemu_console_lookup_by_index(i); QemuConsole *con = qemu_console_lookup_by_index(i);
assert(con != NULL); assert(con != NULL);
@ -812,6 +811,7 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
sdl2_console[i].hidden = true; sdl2_console[i].hidden = true;
} }
sdl2_console[i].idx = i; sdl2_console[i].idx = i;
sdl2_console[i].opts = o;
#ifdef CONFIG_OPENGL #ifdef CONFIG_OPENGL
sdl2_console[i].opengl = display_opengl; sdl2_console[i].opengl = display_opengl;
sdl2_console[i].dcl.ops = display_opengl ? &dcl_gl_ops : &dcl_2d_ops; sdl2_console[i].dcl.ops = display_opengl ? &dcl_gl_ops : &dcl_2d_ops;