Explorar o código

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>
Gerd Hoffmann %!s(int64=4) %!d(string=hai) anos
pai
achega
39b8a183e2
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      hw/display/qxl.c

+ 3 - 1
hw/display/qxl.c

@@ -2283,7 +2283,9 @@ static int qxl_pre_save(void *opaque)
     } else {
     } else {
         d->last_release_offset = (uint8_t *)d->last_release - ram_start;
         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;
     return 0;
 }
 }