Patchwork qxl: make sure primary surface is saved on migration

login
register
mail settings
Submitter Yonit Halperin
Date July 4, 2011, 10:58 a.m.
Message ID <1309777092-21863-1-git-send-email-yhalperi@redhat.com>
Download mbox | patch
Permalink /patch/103090/
State New
Headers show

Comments

Yonit Halperin - July 4, 2011, 10:58 a.m.
---
 hw/qxl.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
Gerd Hoffmann - July 4, 2011, 11:09 a.m.
Hi,

> +        qxl_set_dirty(devram_addr, devram_addr + qxl->vga.vram_size);

It is enougth to dirty the surface0 area.
Otherwise the patch looks fine.

cheers,
   Gerd

Patch

diff --git a/hw/qxl.c b/hw/qxl.c
index 2bb36c6..9fdeffb 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1165,11 +1165,14 @@  static void qxl_vm_change_state_handler(void *opaque, int running, int reason)
     qemu_spice_vm_change_state_handler(&qxl->ssd, running, reason);
 
     if (!running && qxl->mode == QXL_MODE_NATIVE) {
-        /* dirty all vram (which holds surfaces) to make sure it is saved */
+        /* dirty all vram (which holds surfaces) and devram (primary surface)
+         * to make sure they are saved */
         /* FIXME #1: should go out during "live" stage */
         /* FIXME #2: we only need to save the areas which are actually used */
-        ram_addr_t addr = qxl->vram_offset;
-        qxl_set_dirty(addr, addr + qxl->vram_size);
+        ram_addr_t vram_addr = qxl->vram_offset;
+        ram_addr_t devram_addr = qxl->vga.vram_offset;
+        qxl_set_dirty(vram_addr, vram_addr + qxl->vram_size);
+        qxl_set_dirty(devram_addr, devram_addr + qxl->vga.vram_size);
     }
 }