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 4E21E1FF13F for ; Thu, 23 Apr 2026 14:40:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2B533167D8; Thu, 23 Apr 2026 14:40:32 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 5/7] clone disk/block jobs: change signatures to take guest agent property string Date: Thu, 23 Apr 2026 14:35:16 +0200 Message-ID: <20260423124004.115303-6-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: 1776947919188 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 Message-ID-Hash: RUJ77NDVDNZOF3DS6HPYL4NLUAEILDNR X-Message-ID-Hash: RUJ77NDVDNZOF3DS6HPYL4NLUAEILDNR 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. Note that the caller of clone_disk() for moving a disk is changed to pass the guest agent config too for completeness. It doesn't have an effect since the mirror job does not look at it when the destination is the same VM. Signed-off-by: Fiona Ebner --- Changes in v2: * Adapt to new should_fsfreeze() function. * Pass guest agent config for move disk caller of clone_disk() for completenetss. src/PVE/API2/Qemu.pm | 10 +++------- src/PVE/QemuServer.pm | 2 +- src/PVE/QemuServer/BlockJob.pm | 10 ++++++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index e49e8dab..a2676b3f 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -376,8 +376,6 @@ 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->{agent}); - return PVE::QemuServer::clone_disk( $storecfg, $source_info, @@ -386,7 +384,7 @@ my $import_from_volid = sub { $vollist, undef, undef, - $fs_freeze, + $src_conf->{agent}, PVE::Storage::get_bandwidth_limit('clone', [$src_storeid, $dest_info->{storage}]), ); }; @@ -4606,8 +4604,6 @@ __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->{agent}); - my $newdrive = PVE::QemuServer::clone_disk( $storecfg, $source_info, @@ -4616,7 +4612,7 @@ __PACKAGE__->register_method({ $newvollist, $jobs, $completion, - $fs_freeze, + $oldconf->{agent}, $clonelimit, ); @@ -4894,7 +4890,7 @@ __PACKAGE__->register_method({ $newvollist, undef, undef, - undef, + $conf->{agent}, $movelimit, ); $conf->{$disk} = PVE::QemuServer::print_drive($newdrive); diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index ec311160..5d7b5743 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -7958,7 +7958,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 2b14a679..93a1ce60 100644 --- a/src/PVE/QemuServer/BlockJob.pm +++ b/src/PVE/QemuServer/BlockJob.pm @@ -162,13 +162,14 @@ 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::should_fs_freeze($qga); + 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_fs_freeze($vmid); }; warn $@ if $@; } else { - if (!$qga) { + if (!$freeze_enabled) { print "skipping guest-agent 'guest-fsfreeze-freeze', disabled in VM" . " options\n"; } else { @@ -430,8 +431,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