From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 7E0941FF13B for ; Wed, 25 Mar 2026 22:34:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 78E9335B05; Wed, 25 Mar 2026 22:34:25 +0100 (CET) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 1/4] agent: add should_fs_freeze helper Date: Wed, 25 Mar 2026 22:28:02 +0100 Message-ID: <20260325213415.3861690-2-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260325213415.3861690-1-t.lamprecht@proxmox.com> References: <20260325213415.3861690-1-t.lamprecht@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774474412404 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.011 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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: QJ3HEYCTZFO74ZH7PWA426PRSLPIKZXE X-Message-ID-Hash: QJ3HEYCTZFO74ZH7PWA426PRSLPIKZXE X-MailFrom: t.lamprecht@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: Add a centralized helper that checks whether guest filesystem freeze/thaw should be attempted, combining the agent-enabled and guest-fsfreeze setting checks. This replaces duplicated inline logic and the scattered '// 1' default fallback across call sites. No behavioral change intended, the helper returns the same result as the previous inline expressions. Signed-off-by: Thomas Lamprecht --- src/PVE/API2/Qemu.pm | 10 ++++------ src/PVE/QemuConfig.pm | 5 ++--- src/PVE/QemuServer/Agent.pm | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index 1752f46a..020c68b2 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -374,8 +374,7 @@ my $import_from_volid = sub { my ($src_storeid) = PVE::Storage::parse_volume_id($src_volid); - my $qga = PVE::QemuServer::Agent::get_qga_key($src_conf, 'enabled') - && (PVE::QemuServer::Agent::get_qga_key($src_conf, 'guest-fsfreeze') // 1); + my $fs_freeze = PVE::QemuServer::Agent::should_fs_freeze($src_conf); return PVE::QemuServer::clone_disk( $storecfg, @@ -385,7 +384,7 @@ my $import_from_volid = sub { $vollist, undef, undef, - $qga, + $fs_freeze, PVE::Storage::get_bandwidth_limit('clone', [$src_storeid, $dest_info->{storage}]), ); }; @@ -4562,8 +4561,7 @@ __PACKAGE__->register_method({ $dest_info->{efisize} = PVE::QemuServer::get_efivars_size($oldconf) if $opt eq 'efidisk0'; - my $qga = PVE::QemuServer::Agent::get_qga_key($oldconf, 'enabled') - && (PVE::QemuServer::Agent::get_qga_key($oldconf, 'guest-fsfreeze') // 1); + my $fs_freeze = PVE::QemuServer::Agent::should_fs_freeze($oldconf); my $newdrive = PVE::QemuServer::clone_disk( $storecfg, @@ -4573,7 +4571,7 @@ __PACKAGE__->register_method({ $newvollist, $jobs, $completion, - $qga, + $fs_freeze, $clonelimit, ); diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm index 462d1d6d..839b6cd0 100644 --- a/src/PVE/QemuConfig.pm +++ b/src/PVE/QemuConfig.pm @@ -297,9 +297,8 @@ sub __snapshot_check_freeze_needed { return ( $running, $running - && PVE::QemuServer::Agent::get_qga_key($config, 'enabled') - && PVE::QemuServer::Agent::qga_check_running($vmid) - && (PVE::QemuServer::Agent::get_qga_key($config, 'guest-fsfreeze') // 1), + && PVE::QemuServer::Agent::should_fs_freeze($config) + && PVE::QemuServer::Agent::qga_check_running($vmid), ); } else { return ($running, 0); diff --git a/src/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm index 1e7b1895..7520dd6e 100644 --- a/src/PVE/QemuServer/Agent.pm +++ b/src/PVE/QemuServer/Agent.pm @@ -202,6 +202,21 @@ sub qemu_exec_status { return $res; } +=head3 should_fs_freeze + +Returns whether guest filesystem freeze/thaw should be attempted based on the agent configuration. +Does B check whether the agent is actually running. + +=cut + +sub should_fs_freeze { + my ($conf) = @_; + + my $agent = parse_guest_agent($conf); + return 0 if !$agent->{enabled}; + return $agent->{'guest-fsfreeze'} // 1; +} + =head3 guest_fsfreeze guest_fsfreeze($vmid); -- 2.47.3