From: Gerd Hoffmann Date: Fri, 19 Feb 2016 08:23:03 +0000 (+0100) Subject: spice: init dcl before registering qxl interface X-Git-Tag: TizenStudio_2.0_p2.4~27^2~6^2~8^2~160^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5e751b51f14cffada6be647aa576b79f1755d7e;p=sdk%2Femulator%2Fqemu.git spice: init dcl before registering qxl interface Without this spice might callback into qemu before ssd->dcl.con is initialized, resulting in a segfault due to NULL pointer dereference. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-André Lureau --- diff --git a/ui/spice-display.c b/ui/spice-display.c index 8a5b325..cdbc78d 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -775,14 +775,14 @@ static void qemu_spice_display_init_one(QemuConsole *con) qemu_spice_display_init_common(ssd); + ssd->dcl.ops = &display_listener_ops; + ssd->dcl.con = con; + ssd->qxl.base.sif = &dpy_interface.base; qemu_spice_add_display_interface(&ssd->qxl, con); assert(ssd->worker); - qemu_spice_create_host_memslot(ssd); - ssd->dcl.ops = &display_listener_ops; - ssd->dcl.con = con; register_displaychangelistener(&ssd->dcl); }