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 777AB1FF13F for ; Thu, 23 Apr 2026 14:40:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 267BA16634; Thu, 23 Apr 2026 14:40:16 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 4/7] agent: should fs freeze: change signature to take property string rather than full VM config Date: Thu, 23 Apr 2026 14:35:15 +0200 Message-ID: <20260423124004.115303-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260423124004.115303-1-f.ebner@proxmox.com> References: <20260423124004.115303-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: 1776947919131 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.008 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 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. [qemuconfig.pm,agent.pm,qemuserver.pm,qemu.pm] Message-ID-Hash: W7TKYXQEPHVGQLQWV6BRQBMYKCPXENOR X-Message-ID-Hash: W7TKYXQEPHVGQLQWV6BRQBMYKCPXENOR 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: Better encapsulation and in preparation to harmonize checks for freeze while avoiding the need to pass the full config to block jobs. Signed-off-by: Fiona Ebner --- New in v2. src/PVE/API2/Qemu.pm | 4 ++-- src/PVE/QemuConfig.pm | 2 +- src/PVE/QemuServer/Agent.pm | 4 ++-- src/PVE/VZDump/QemuServer.pm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index dadc06b0..e49e8dab 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -376,7 +376,7 @@ my $import_from_volid = sub { my ($src_storeid) = PVE::Storage::parse_volume_id($src_volid); - my $fs_freeze = PVE::QemuServer::Agent::should_fs_freeze($src_conf); + my $fs_freeze = PVE::QemuServer::Agent::should_fs_freeze($src_conf->{agent}); return PVE::QemuServer::clone_disk( $storecfg, @@ -4606,7 +4606,7 @@ __PACKAGE__->register_method({ $dest_info->{efisize} = PVE::QemuServer::get_efivars_size($oldconf) if $opt eq 'efidisk0'; - my $fs_freeze = PVE::QemuServer::Agent::should_fs_freeze($oldconf); + my $fs_freeze = PVE::QemuServer::Agent::should_fs_freeze($oldconf->{agent}); my $newdrive = PVE::QemuServer::clone_disk( $storecfg, diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm index f93ee5bb..eedb34f9 100644 --- a/src/PVE/QemuConfig.pm +++ b/src/PVE/QemuConfig.pm @@ -297,7 +297,7 @@ sub __snapshot_check_freeze_needed { return ( $running, $running - && PVE::QemuServer::Agent::should_fs_freeze($config) + && PVE::QemuServer::Agent::should_fs_freeze($config->{agent}) && PVE::QemuServer::Agent::qga_check_running($vmid), ); } else { diff --git a/src/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm index 8b814edd..e63b09f2 100644 --- a/src/PVE/QemuServer/Agent.pm +++ b/src/PVE/QemuServer/Agent.pm @@ -187,8 +187,8 @@ Does B check whether the agent is actually running. =cut -sub should_fs_freeze($conf) { - my $agent = parse_guest_agent($conf->{agent}); +sub should_fs_freeze($agent_str) { + my $agent = parse_guest_agent($agent_str); return 0 if !$agent->{enabled}; return $agent->{'freeze-fs'} // 1; } diff --git a/src/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm index ca4a8513..9952cff1 100644 --- a/src/PVE/VZDump/QemuServer.pm +++ b/src/PVE/VZDump/QemuServer.pm @@ -1110,7 +1110,7 @@ sub qga_fs_freeze { return; } - if (!PVE::QemuServer::Agent::should_fs_freeze($conf)) { + if (!PVE::QemuServer::Agent::should_fs_freeze($conf->{agent})) { $self->loginfo("skipping guest-agent 'fs-freeze', disabled in VM options"); return; } -- 2.47.3