From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PULL 2/6] qxl: remove assert in qxl_pre_save.
Date: Fri, 23 Jul 2021 07:54:44 +0200 [thread overview]
Message-ID: <20210723055448.1032115-3-kraxel@redhat.com> (raw)
In-Reply-To: <20210723055448.1032115-1-kraxel@redhat.com>
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
next prev parent reply other threads:[~2021-07-23 5:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 5:54 [PULL 0/6] Vga 20210723 patches Gerd Hoffmann
2021-07-23 5:54 ` [PULL 1/6] hw/display/virtio-gpu: Fix memory leak (CID 1453811) Gerd Hoffmann
2021-07-23 5:54 ` Gerd Hoffmann [this message]
2021-07-23 5:54 ` [PULL 3/6] Revert "qxl: add migration blocker to avoid pre-save assert" Gerd Hoffmann
2021-07-23 5:54 ` [PULL 4/6] hw/display: fail early when multiple virgl devices are requested Gerd Hoffmann
2021-07-23 5:54 ` [PULL 5/6] vl: add virtio-vga-gl to the default_list Gerd Hoffmann
2021-07-23 5:54 ` [PULL 6/6] hw/display: fix virgl reset regression Gerd Hoffmann
2021-07-23 14:26 ` [PULL 0/6] Vga 20210723 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210723055448.1032115-3-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).