From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 24 Jan 2017 11:10:39 +0000 (+0100)
Subject: console: fix console resize
X-Git-Tag: v2.9.0-rc2~172^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3ef0c573d37b117867352a8bd8c567d3b774fe37;p=mirror_qemu.git

console: fix console resize

Only skip surface reallocation in case the old surface was created using
qemu_alloc_display (via qemu_create_displaysurface) too, otherwise we
might end up with a DisplaySurface with the wrong backing storage.

Cc: 1658634@bugs.launchpad.net
Fixes: cd958edb1fae85d0c7d1e1acbff82d22724e8d64
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 1485256239-12219-1-git-send-email-kraxel@redhat.com
---

diff --git a/ui/console.c b/ui/console.c
index fe03a666f7..e353c85681 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2116,7 +2116,7 @@ void qemu_console_resize(QemuConsole *s, int width, int height)
 
     assert(s->console_type == GRAPHIC_CONSOLE);
 
-    if (s->surface &&
+    if (s->surface && (s->surface->flags & QEMU_ALLOCATED_FLAG) &&
         pixman_image_get_width(s->surface->image) == width &&
         pixman_image_get_height(s->surface->image) == height) {
         return;