From af64ed13eb12a5dc9fa8f3823396a1a9b4267c6e Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Wed, 13 Oct 2021 17:48:38 +0200 Subject: [PATCH] add fixup patch for qxl migration logic Signed-off-by: Stefan Reiter --- .../extra/0006-qxl-fix-pre-save-logic.patch | 34 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 debian/patches/extra/0006-qxl-fix-pre-save-logic.patch diff --git a/debian/patches/extra/0006-qxl-fix-pre-save-logic.patch b/debian/patches/extra/0006-qxl-fix-pre-save-logic.patch new file mode 100644 index 0000000..398781a --- /dev/null +++ b/debian/patches/extra/0006-qxl-fix-pre-save-logic.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Fri, 10 Sep 2021 11:42:03 +0200 +Subject: [PATCH] qxl: fix pre-save logic +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Oops. Logic is backwards. + +Fixes: 39b8a183e2f3 ("qxl: remove assert in qxl_pre_save.") +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/610 +Resolves: https://bugzilla.redhat.com//show_bug.cgi?id=2002907 +Signed-off-by: Gerd Hoffmann +Reviewed-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20210910094203.3582378-1-kraxel@redhat.com> +--- + hw/display/qxl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hw/display/qxl.c b/hw/display/qxl.c +index 43482d4364..29c80b4289 100644 +--- a/hw/display/qxl.c ++++ b/hw/display/qxl.c +@@ -2252,7 +2252,7 @@ static int qxl_pre_save(void *opaque) + } else { + d->last_release_offset = (uint8_t *)d->last_release - ram_start; + } +- if (d->last_release_offset < d->vga.vram_size) { ++ if (d->last_release_offset >= d->vga.vram_size) { + return 1; + } + diff --git a/debian/patches/series b/debian/patches/series index 7ff4173..c1eecec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,7 @@ extra/0002-monitor-qmp-fix-race-with-clients-disconnecting-earl.patch extra/0003-monitor-hmp-add-support-for-flag-argument-with-value.patch extra/0004-monitor-refactor-set-expire_password-and-allow-VNC-d.patch extra/0005-monitor-hmp-correctly-invert-password-argument-detec.patch +extra/0006-qxl-fix-pre-save-logic.patch bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch