On Wed, Jul 21, 2021 at 1:41 PM Gerd Hoffmann <kra...@redhat.com> wrote:
> 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 <kra...@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
> hw/display/qxl.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/hw/display/qxl.c b/hw/display/qxl.c
> index 84f99088e0a0..3867b94fe236 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;
> }
> --
> 2.31.1
>
>
>
--
Marc-André Lureau
