From: Igor Mitsyanko <i.mitsyanko@gmail.com>
Date: Tue, 19 Mar 2013 19:44:56 +0000 (+0400)
Subject: hw/vmware_vga.c: fix screen resize bug introduced after console revamp
X-Git-Tag: v1.5.0-rc0~251^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17866fc888445ec7d2568645df45bb47e6be01de;p=thirdparty%2Fqemu.git

hw/vmware_vga.c: fix screen resize bug introduced after console revamp

In vmsvga display update function, a pointer to DisplaySurface must be acquired
after a call to vmsvga_check_size since this function might replace current
DisplaySurface with a new one.

Signed-off-by: Igor Mitsyanko <i.mitsyanko@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index bcad47a68dc..2233a8bedef 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -995,7 +995,7 @@ static inline void vmsvga_check_size(struct vmsvga_state_s *s)
 static void vmsvga_update_display(void *opaque)
 {
     struct vmsvga_state_s *s = opaque;
-    DisplaySurface *surface = qemu_console_surface(s->vga.con);
+    DisplaySurface *surface;
     bool dirty = false;
 
     if (!s->enable) {
@@ -1004,6 +1004,7 @@ static void vmsvga_update_display(void *opaque)
     }
 
     vmsvga_check_size(s);
+    surface = qemu_console_surface(s->vga.con);
 
     vmsvga_fifo_run(s);
     vmsvga_update_rect_flush(s);