All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com, Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH 1/2] qxl: remove assert in qxl_pre_save.
Date: Wed, 21 Jul 2021 11:33:46 +0200	[thread overview]
Message-ID: <20210721093347.338536-2-kraxel@redhat.com> (raw)
In-Reply-To: <20210721093347.338536-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>
---
 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



  reply	other threads:[~2021-07-21  9:41 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-21  9:33 [PATCH 0/2] qxl: remove assert and migration blocker Gerd Hoffmann
2021-07-21  9:33 ` Gerd Hoffmann [this message]
2021-07-21 10:43   ` [PATCH 1/2] qxl: remove assert in qxl_pre_save Marc-André Lureau
2021-07-22 14:44   ` Dr. David Alan Gilbert
2021-07-23  6:32     ` Gerd Hoffmann
2021-07-23  6:47       ` Philippe Mathieu-Daudé
2021-07-23  6:55         ` Gerd Hoffmann
2021-07-23  7:34           ` Philippe Mathieu-Daudé
2021-07-23  8:42             ` Markus Armbruster
2021-07-23  9:46               ` Gerd Hoffmann
2021-07-21  9:33 ` [PATCH 2/2] Revert "qxl: add migration blocker to avoid pre-save assert" Gerd Hoffmann
2021-07-21 10:44   ` Marc-André Lureau
2021-07-21 14:15   ` Markus Armbruster

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=20210721093347.338536-2-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --subject='Re: [PATCH 1/2] qxl: remove assert in qxl_pre_save.' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.