]> git.proxmox.com Git - mirror_qemu.git/commitdiff
qxl: remove assert in qxl_pre_save.
authorGerd Hoffmann <kraxel@redhat.com>
Wed, 21 Jul 2021 09:33:46 +0000 (11:33 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Thu, 22 Jul 2021 13:46:47 +0000 (15:46 +0200)
Since commit 551dbd0846d2 ("migration: check pre_save return in
vmstate_save_state") the pre_save hook can fail.  So lets finally
use that to drop the guest-triggerable assert in qxl_pre_save().

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210721093347.338536-2-kraxel@redhat.com>

hw/display/qxl.c

index 84f99088e0a01b279e1c72b3125f2f7193bf7bde..3867b94fe2363345fb80951fb9042fafb1ae0854 100644 (file)
@@ -2283,7 +2283,9 @@ static int qxl_pre_save(void *opaque)
     } else {
         d->last_release_offset = (uint8_t *)d->last_release - ram_start;
     }
-    assert(d->last_release_offset < d->vga.vram_size);
+    if (d->last_release_offset < d->vga.vram_size) {
+        return 1;
+    }
 
     return 0;
 }