From 88229af258214f95739252eb70d947a14439c068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 24 Mar 2025 02:23:56 +0100 Subject: [PATCH] Fix context of 0004-QubesGUI-display-options.patch The context changed slightly on QEMU update, and it's enough to confuse quilt and apply the change in the wrong place. Specifically, "share_surface = false" was added _before_ initializing share_surface that was supposed to be overridden. Fixes: d85279b "Update QEMU to 9.0.2" Fixes QubesOS/qubes-issues#9847 --- qemu/patches/0004-QubesGUI-display-options.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/patches/0004-QubesGUI-display-options.patch b/qemu/patches/0004-QubesGUI-display-options.patch index 028299a..4611825 100644 --- a/qemu/patches/0004-QubesGUI-display-options.patch +++ b/qemu/patches/0004-QubesGUI-display-options.patch @@ -22,14 +22,14 @@ diff --git a/hw/display/vga.c b/hw/display/vga.c index 37557c3442..3206bcb0ff 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c -@@ -1559,6 +1559,8 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) +@@ -1618,6 +1618,8 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) } else { share_surface = false; } + /* XXX: Qubes GUI can't use a shared buffer */ + share_surface = false; - if (s->line_offset != s->last_line_offset || + if (s->params.line_offset != s->last_line_offset || disp_width != s->last_width || diff --git a/include/ui/surface.h b/include/ui/surface.h index 3e8b22d6c6..f3f0dfa5c3 100644