From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWS4y-0002HM-5r for qemu-devel@nongnu.org; Thu, 08 Nov 2012 08:23:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TWS4s-0003St-8f for qemu-devel@nongnu.org; Thu, 08 Nov 2012 08:23:32 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:55134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWS4s-0003Se-25 for qemu-devel@nongnu.org; Thu, 08 Nov 2012 08:23:26 -0500 Received: by mail-pa0-f45.google.com with SMTP id fb10so1942367pad.4 for ; Thu, 08 Nov 2012 05:23:24 -0800 (PST) From: Dunrong Huang Date: Thu, 8 Nov 2012 21:23:16 +0800 Message-Id: <1352380996-25474-1-git-send-email-riegamaths@gmail.com> Subject: [Qemu-devel] [PATCH] ui/spice-display: Avoid segment fault when spice is enabled without qxl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Gerd Hoffmann (gdb) r -enable-kvm -m 512 -spice port=5900,addr=0.0.0.0,disable-ticketing ArchLinux.img Starting program: /root/usr/bin/qemu-system-x86_64 -enable-kvm -m 512 -spice port=5900,addr=0.0.0.0,disable-ticketing ArchLinux.img warning: Could not load shared library symbols for linux-vdso.so.1. Do you need "set solib-search-path" or "set sysroot"? [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". [New Thread 0x7fffeed93700 (LWP 23838)] [New Thread 0x7fffee391700 (LWP 23839)] Program received signal SIGSEGV, Segmentation fault. 0x00005555557df97d in qemu_spice_destroy_primary_surface (ssd=0x55555611ca80, id=0, async=QXL_SYNC) at ui/spice-display.c:119 119 ssd->worker->destroy_primary_surface(ssd->worker, id); (gdb) bt ssd=0x55555611ca80, id=0, async=QXL_SYNC) at ui/spice-display.c:119 at ui/spice-display.c:343 at ui/spice-display.c:397 at ui/spice-display.c:566 dcl=0x555555cdb040) at ./console.h:218 at ui/spice-display.c:585 envp=0x7fffffffda18) at vl.c:3902 (gdb) p ssd->worker $1 = (QXLWorker *) 0x0 ... ... Before qemu_spice_add_interface() was called, sdpy.worker was not be initialized yet, in this case, segment fault occurred while qemu_spice_display_resize() was called. Signed-off-by: Dunrong Huang --- ui/spice-display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ui/spice-display.c b/ui/spice-display.c index fb99148..b256caa 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -562,7 +562,9 @@ static void display_update(struct DisplayState *ds, int x, int y, int w, int h) static void display_resize(struct DisplayState *ds) { - qemu_spice_display_resize(&sdpy); + if (sdpy.worker) { + qemu_spice_display_resize(&sdpy); + } } static void display_refresh(struct DisplayState *ds) -- 1.8.0