From: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 28 Mar 2009 17:29:02 +0000 (+0000)
Subject: Fix monitor command (screendump) (Stefan Weil)
X-Git-Tag: v0.11.0-rc0~1075
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81f099ad3266eede194bcb80f44e9ffe1772f257;p=thirdparty%2Fqemu.git

Fix monitor command (screendump) (Stefan Weil)

starting with r6839, the monitor command 'screendump'
raises a nullpointer memory access which crashs Qemu.

Fix crash when calling screendump from monitor.

This was a regression introduced with r6839:
DisplayAllocator interface (Stefano Stabellini)

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6900 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/vga.c b/hw/vga.c
index eeb77f1ff33..b1e43730db9 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2637,6 +2637,7 @@ static void vga_screen_dump_common(VGAState *s, const char *filename,
     dcl.dpy_resize = vga_save_dpy_resize;
     dcl.dpy_refresh = vga_save_dpy_refresh;
     register_displaychangelistener(ds, &dcl);
+    ds->allocator = &default_allocator;
     ds->surface = qemu_create_displaysurface(ds, w, h);
 
     s->ds = ds;