From 0fd86faff3cc319606733526636238c6a3e2fcc1 Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Fri, 5 Nov 2021 01:48:13 +0100 Subject: [PATCH] qemu: fix `savevm` when using `-vga qxl` --- srcpkgs/qemu/patches/savevm-qxl.patch | 37 +++++++++++++++++++++++++++ srcpkgs/qemu/template | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/qemu/patches/savevm-qxl.patch diff --git a/srcpkgs/qemu/patches/savevm-qxl.patch b/srcpkgs/qemu/patches/savevm-qxl.patch new file mode 100644 index 000000000000..fcab4b05f8ae --- /dev/null +++ b/srcpkgs/qemu/patches/savevm-qxl.patch @@ -0,0 +1,37 @@ +From eb94846280df3f1e2a91b6179fc05f9890b7e384 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; + } + +-- +GitLab + diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index cb21578cfed2..3a904654d3ca 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -2,7 +2,7 @@ # This package should be updated together with qemu-user-static pkgname=qemu version=6.1.0 -revision=3 +revision=4 build_style=configure hostmakedepends="gettext pkg-config perl python3 automake libtool flex python3-Sphinx python3-sphinx_rtd_theme texinfo ninja"