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 59E3C1FF144 for ; Tue, 24 Mar 2026 14:53:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C97CC12DE5; Tue, 24 Mar 2026 14:53:35 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 6/8] clone disk/block jobs: change signatures to take guest agent property string Date: Tue, 24 Mar 2026 14:50:46 +0100 Message-ID: <20260324135325.120749-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260324135325.120749-1-f.ebner@proxmox.com> References: <20260324135325.120749-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: 1774360362437 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 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 Message-ID-Hash: DGOXGYX2KK5CYHADCI24KD5WZFUSCDIV X-Message-ID-Hash: DGOXGYX2KK5CYHADCI24KD5WZFUSCDIV 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: In preparation to harmonize checks for guest fs freeze. Signed-off-by: Fiona Ebner --- src/PVE/API2/Qemu.pm | 14 ++------------ src/PVE/QemuServer.pm | 2 +- src/PVE/QemuServer/BlockJob.pm | 12 ++++++++---- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index 841c4830..2c338295 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -374,9 +374,6 @@ 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->{agent}, 'enabled') - && (PVE::QemuServer::Agent::get_qga_key($src_conf->{agent}, 'guest-fsfreeze') // 1); - return PVE::QemuServer::clone_disk( $storecfg, $source_info, @@ -385,7 +382,7 @@ my $import_from_volid = sub { $vollist, undef, undef, - $qga, + $src_conf->{agent}, PVE::Storage::get_bandwidth_limit('clone', [$src_storeid, $dest_info->{storage}]), ); }; @@ -4562,13 +4559,6 @@ __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->{agent}, 'enabled') - && ( - PVE::QemuServer::Agent::get_qga_key( - $oldconf->{agent}, 'guest-fsfreeze', - ) // 1 - ); - my $newdrive = PVE::QemuServer::clone_disk( $storecfg, $source_info, @@ -4577,7 +4567,7 @@ __PACKAGE__->register_method({ $newvollist, $jobs, $completion, - $qga, + $oldconf->{agent}, $clonelimit, ); diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 039b6a8c..5d900239 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -7939,7 +7939,7 @@ sub clone_disk { $dest_info->{'zero-initialized'} = 1 if $sparseinit; $dest_info->{vmid} = $newvmid if defined($newvmid); my $mirror_opts = {}; - $mirror_opts->{'guest-agent'} = 1 if $qga; + $mirror_opts->{'guest-agent'} = $qga; $mirror_opts->{bwlimit} = $bwlimit if defined($bwlimit); PVE::QemuServer::BlockJob::mirror( $source_info, diff --git a/src/PVE/QemuServer/BlockJob.pm b/src/PVE/QemuServer/BlockJob.pm index d7c78741..dc5804a6 100644 --- a/src/PVE/QemuServer/BlockJob.pm +++ b/src/PVE/QemuServer/BlockJob.pm @@ -162,13 +162,16 @@ sub monitor { last if $completion eq 'skip' || $completion eq 'auto'; if ($vmiddst && $vmiddst != $vmid) { - my $should_fsfreeze = $qga && qga_check_running($vmid); + my $freeze_enabled = + PVE::QemuServer::Agent::get_qga_key($qga, 'enabled') && + (PVE::QemuServer::Agent::get_qga_key($qga, 'guest-fsfreeze') // 1); + my $should_fsfreeze = $freeze_enabled && qga_check_running($vmid); if ($should_fsfreeze) { print "issuing guest agent 'guest-fsfreeze-freeze' command\n"; eval { PVE::QemuServer::Agent::guest_fsfreeze($vmid); }; warn $@ if $@; } else { - if (!$qga) { + if (!$freeze_enabled) { print "skipping guest-agent 'guest-fsfreeze-freeze', disabled in VM" . " options\n"; } else { @@ -430,8 +433,9 @@ original drive to use the new target. =over -=item C<< $options->{'guest-agent'} >>: If the guest agent is configured for the VM. It will be used -to freeze and thaw the filesystems for consistency when the target belongs to a different VM. +=item C<< $options->{'guest-agent'} >>: The guest agent configuration of the VM, i.e. the 'agent' +property string. If enabled by the configuration, freeze and thaw the filesystems for consistency +when the target belongs to a different VM. =item C<< $options->{'bwlimit'} >>: The bandwidth limit to use for the mirroring operation, in KiB/s. -- 2.47.3