Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save. - Marc-André Lureau

From: "Marc-André Lureau" <marcandre.lureau@gmail.com>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: QEMU <qemu-devel@nongnu.org>, Markus Armbruster <armbru@redhat.com>
Subject: Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save.
Date: Wed, 21 Jul 2021 14:43:05 +0400	[thread overview]
Message-ID: <CAJ+F1CJd1fEo8v9DbOLK4e9Vq=yL5wPTZZm5PL5UhxRwyLAtSg@mail.gmail.com> (raw)
In-Reply-To: <20210721093347.338536-2-kraxel@redhat.com>

[-- Attachment #1: Type: text/plain, Size: 1035 bytes --]

On Wed, Jul 21, 2021 at 1:41 PM Gerd Hoffmann <kraxel@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 <kraxel@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@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

[-- Attachment #2: Type: text/html, Size: 1810 bytes --]