From b34716a4e7a0b378d87ac9d05d5e17352bfa9294 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 08 2021 18:18:35 +0000
Subject: Fix snapshot creation with qxl graphics


---

diff --git a/0001-qxl-fix-pre-save-logic.patch b/0001-qxl-fix-pre-save-logic.patch
new file mode 100644
index 0000000..ab92d63
--- /dev/null
+++ b/0001-qxl-fix-pre-save-logic.patch
@@ -0,0 +1,37 @@
+From eb94846280df3f1e2a91b6179fc05f9890b7e384 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Fri, 10 Sep 2021 11:42:03 +0200
+Subject: [PATCH 1/1] 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 <kraxel@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+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;
+     }
+ 
+-- 
+2.33.1
+
diff --git a/qemu.spec b/qemu.spec
index 745e768..d6bd1b3 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -287,7 +287,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 6.1.0
-Release: 9%{?rcrel}%{?dist}
+Release: 10%{?rcrel}%{?dist}
 Epoch: 2
 License: GPLv2 and BSD and MIT and CC-BY
 URL: http://www.qemu.org/
@@ -317,6 +317,10 @@ Patch2: 0001-tcg-arm-Reduce-vector-alignment-requirement-for-NEON.patch
 Patch3: 0001-qemu-sockets-fix-unix-socket-path-copy-again.patch
 # Fix tcg PVH test with binutils 2.36+
 Patch4: 0001-tests-tcg-Fix-PVH-test-with-binutils-2.36.patch
+# Fix snapshot creation with qxl graphics
+# https://gitlab.com/qemu-project/qemu/-/issues/610
+# https://gitlab.com/qemu-project/qemu/-/commit/eb94846
+Patch5: 0001-qxl-fix-pre-save-logic.patch
 
 BuildRequires: meson >= %{meson_version}
 BuildRequires: zlib-devel
@@ -2249,6 +2253,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
+* Mon Nov 08 2021 Adam Williamson <awilliam@redhat.com> - 6.1.0-10
+- Fix snapshot creation with qxl graphics
+
 * Fri Oct 08 2021 Cole Robinson <crobinso@redhat.com> - 6.1.0-9
 - Fix tcg PVH test with binutils 2.36+