From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DD64875669 for ; Wed, 13 Oct 2021 17:49:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB59A13D4D for ; Wed, 13 Oct 2021 17:49:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 42D5A13D3F for ; Wed, 13 Oct 2021 17:49:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2088A45DD7 for ; Wed, 13 Oct 2021 17:49:00 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Cc: Thomas Lamprecht Date: Wed, 13 Oct 2021 17:48:38 +0200 Message-Id: <20211013154838.2636157-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211011115534.880183-1-s.reiter@proxmox.com> References: <20211011115534.880183-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.511 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [gitlab.com] Subject: [pve-devel] [PATCH pve-qemu] add fixup patch for qxl migration logic X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2021 15:49:01 -0000 Signed-off-by: Stefan Reiter --- Applies on top of the 6.1 rebase. .../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 -- 2.30.2