From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 515091FF0C0 for ; Wed, 18 Nov 2026 13:24:22 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id E246321735; Wed, 18 Nov 2026 13:24:07 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 2/3] snapshot: directly check for savevm-end status Date: Wed, 18 Nov 2026 13:21:48 +0100 Message-ID: <20261118122359.123647-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118122359.123647-1-f.ebner@proxmox.com> References: <20261118122359.123647-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795004642503 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.251 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: IE2D7VMOORSRKUT4ORZN5NGDPABYR5FF X-Message-ID-Hash: IE2D7VMOORSRKUT4ORZN5NGDPABYR5FF X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Since pve-qemu >= 11.1.3-3, 'query-savevm' reports if there is an active 'savevm-end' handler. Check this status directly, while keeping the proxy check for the presence of 'bytes' for compatibility with older QEMU binaries. Checking for 'bytes' did not work as a sentinel in case the snapshot ended with an error status, as the field was always present. Signed-off-by: Fiona Ebner --- NOTE: the version in the commit message needs to be adapted depending on the pve-qemu-kvm version for which patch 3/3 is applied. src/PVE/QemuConfig.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm index f35a49eb..a8279ac6 100644 --- a/src/PVE/QemuConfig.pm +++ b/src/PVE/QemuConfig.pm @@ -395,9 +395,14 @@ sub __snapshot_create_vol_snapshots_hook { my $start_time = time(); for (;;) { my $stat = mon_cmd($vmid, "query-savevm"); - if (!$stat->{bytes}) { - last; - } elsif ((time() - $start_time) >= $timeout) { + + if (defined($stat->{'savevm-end-active'})) { + last if !$stat->{'savevm-end-active'}; + } else { # Fallback for older QEMU binaries that did not report savevm-end-active + last if !$stat->{bytes}; + } + + if ((time() - $start_time) >= $timeout) { warn "timeout waiting for 'savevm-end' to complete\n"; last; } else { -- 2.47.3