From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 21 Oct 2011 19:53:54 +0000 (+0200)
Subject: qxl: make sure we continue to run with a shared buffer
X-Git-Tag: v1.0-rc0~9^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a053f1b1fb63cb57483354db7b154e9a2e585b5a;p=thirdparty%2Fqemu.git

qxl: make sure we continue to run with a shared buffer

The qxl renderer works only with a shared displaysurface.  So better
make sure we actually have one and restore it when needed.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/qxl-render.c b/hw/qxl-render.c
index a5676938a83..2c51ba9806d 100644
--- a/hw/qxl-render.c
+++ b/hw/qxl-render.c
@@ -76,7 +76,14 @@ void qxl_render_update(PCIQXLDevice *qxl)
     VGACommonState *vga = &qxl->vga;
     QXLRect dirty[32], update;
     void *ptr;
-    int i;
+    int i, redraw = 0;
+
+    if (!is_buffer_shared(vga->ds->surface)) {
+        dprint(qxl, 1, "%s: restoring shared displaysurface\n", __func__);
+        qxl->guest_primary.resized++;
+        qxl->guest_primary.commands++;
+        redraw = 1;
+    }
 
     if (qxl->guest_primary.resized) {
         qxl->guest_primary.resized = 0;
@@ -127,6 +134,10 @@ void qxl_render_update(PCIQXLDevice *qxl)
     memset(dirty, 0, sizeof(dirty));
     qxl_spice_update_area(qxl, 0, &update,
                           dirty, ARRAY_SIZE(dirty), 1, QXL_SYNC);
+    if (redraw) {
+        memset(dirty, 0, sizeof(dirty));
+        dirty[0] = update;
+    }
 
     for (i = 0; i < ARRAY_SIZE(dirty); i++) {
         if (qemu_spice_rect_is_empty(dirty+i)) {