From b5e751b51f14cffada6be647aa576b79f1755d7e Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 19 Feb 2016 09:23:03 +0100 Subject: spice: init dcl before registering qxl interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ui/spice-display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ui/spice-display.c') diff --git a/ui/spice-display.c b/ui/spice-display.c index 8a5b3258bd..cdbc78d81a 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); } -- cgit v1.2.1