[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/6] qxl: remove assert in qxl_pre_save.
From: |
Gerd Hoffmann |
Subject: |
[PULL 2/6] qxl: remove assert in qxl_pre_save. |
Date: |
Fri, 23 Jul 2021 07:54:44 +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>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210721093347.338536-2-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
- [PULL 0/6] Vga 20210723 patches, Gerd Hoffmann, 2021/07/23
- [PULL 1/6] hw/display/virtio-gpu: Fix memory leak (CID 1453811), Gerd Hoffmann, 2021/07/23
- [PULL 2/6] qxl: remove assert in qxl_pre_save.,
Gerd Hoffmann <=
- [PULL 4/6] hw/display: fail early when multiple virgl devices are requested, Gerd Hoffmann, 2021/07/23
- [PULL 3/6] Revert "qxl: add migration blocker to avoid pre-save assert", Gerd Hoffmann, 2021/07/23
- [PULL 5/6] vl: add virtio-vga-gl to the default_list, Gerd Hoffmann, 2021/07/23
- [PULL 6/6] hw/display: fix virgl reset regression, Gerd Hoffmann, 2021/07/23
- Re: [PULL 0/6] Vga 20210723 patches, Peter Maydell, 2021/07/23