| Message ID | 20180515082319.30723-1-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | sdl2: move opts assignment into loop | expand |
On 05/15/2018 05:23 AM, Gerd Hoffmann wrote: > So the opts pointer is set for all sdl2_consoles. > > Fixes: 844fd50dbbcfc9e401895274bf4fb8da8e8d3f64 > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > ui/sdl2.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ui/sdl2.c b/ui/sdl2.c > index da037248c2..a0f9b16bc1 100644 > --- a/ui/sdl2.c > +++ b/ui/sdl2.c > @@ -804,7 +804,6 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o) > return; > } > sdl2_console = g_new0(struct sdl2_console, sdl2_num_outputs); > - sdl2_console->opts = o; > for (i = 0; i < sdl2_num_outputs; i++) { > QemuConsole *con = qemu_console_lookup_by_index(i); > assert(con != NULL); > @@ -812,6 +811,7 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o) > sdl2_console[i].hidden = true; > } > sdl2_console[i].idx = i; > + sdl2_console[i].opts = o; > #ifdef CONFIG_OPENGL > sdl2_console[i].opengl = display_opengl; > sdl2_console[i].dcl.ops = display_opengl ? &dcl_gl_ops : &dcl_2d_ops; >
diff --git a/ui/sdl2.c b/ui/sdl2.c index da037248c2..a0f9b16bc1 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -804,7 +804,6 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o) return; } sdl2_console = g_new0(struct sdl2_console, sdl2_num_outputs); - sdl2_console->opts = o; for (i = 0; i < sdl2_num_outputs; i++) { QemuConsole *con = qemu_console_lookup_by_index(i); assert(con != NULL); @@ -812,6 +811,7 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o) sdl2_console[i].hidden = true; } sdl2_console[i].idx = i; + sdl2_console[i].opts = o; #ifdef CONFIG_OPENGL sdl2_console[i].opengl = display_opengl; sdl2_console[i].dcl.ops = display_opengl ? &dcl_gl_ops : &dcl_2d_ops;
So the opts pointer is set for all sdl2_consoles. Fixes: 844fd50dbbcfc9e401895274bf4fb8da8e8d3f64 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- ui/sdl2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)