From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 21 Jul 2021 09:33:46 +0000 (+0200)
Subject: qxl: remove assert in qxl_pre_save.
X-Git-Tag: qemu-xen-4.16.0-rc4~47^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=39b8a183e2f399d19f3ab6a3db44c7c74774dabd;p=qemu-xen.git

qxl: remove assert in qxl_pre_save.

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>
---

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 84f99088e0..3867b94fe2 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -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;
 }