diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2021-07-21 11:33:46 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2021-07-22 15:46:47 +0200 |
| commit | 39b8a183e2f399d19f3ab6a3db44c7c74774dabd (patch) | |
| tree | df7c7abbe82a0a8d64ce5febf06296726a7a77d7 /hw/display/qxl.c | |
| parent | dc2deaba4852e3324a4558a8bd29c58ce3299699 (diff) | |
| download | focaccia-qemu-39b8a183e2f399d19f3ab6a3db44c7c74774dabd.tar.gz focaccia-qemu-39b8a183e2f399d19f3ab6a3db44c7c74774dabd.zip | |
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>
Diffstat (limited to 'hw/display/qxl.c')
| -rw-r--r-- | hw/display/qxl.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |