[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] qxl: remove assert in qxl_pre_save.
From: |
Gerd Hoffmann |
Subject: |
[PATCH 1/2] qxl: remove assert in qxl_pre_save. |
Date: |
Wed, 21 Jul 2021 11:33:46 +0200 |
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>
---
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
- [PATCH 0/2] qxl: remove assert and migration blocker, Gerd Hoffmann, 2021/07/21
- [PATCH 1/2] qxl: remove assert in qxl_pre_save.,
Gerd Hoffmann <=
- Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save., Marc-André Lureau, 2021/07/21
- Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save., Dr. David Alan Gilbert, 2021/07/22
- Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save., Gerd Hoffmann, 2021/07/23
- Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save., Philippe Mathieu-Daudé, 2021/07/23
- Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save., Gerd Hoffmann, 2021/07/23
- Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save., Philippe Mathieu-Daudé, 2021/07/23
- Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save., Markus Armbruster, 2021/07/23
- Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save., Gerd Hoffmann, 2021/07/23
[PATCH 2/2] Revert "qxl: add migration blocker to avoid pre-save assert", Gerd Hoffmann, 2021/07/21