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 90E481FF13F for ; Thu, 23 Apr 2026 14:40:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CD58416B39; Thu, 23 Apr 2026 14:40:46 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 2/7] agent: rename guest_fs{freeze,thaw} to guest_fs_{freeze,thaw} Date: Thu, 23 Apr 2026 14:35:13 +0200 Message-ID: <20260423124004.115303-3-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: 1776947919013 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. [qemuserver.pm,agent.pm,qemuconfig.pm,blockjob.pm,qmpclient.pm] Message-ID-Hash: YLYUPECKQN6GX7ZOCMVWH3KUK7EFQTWS X-Message-ID-Hash: YLYUPECKQN6GX7ZOCMVWH3KUK7EFQTWS 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: For better consistency with should_fs_freeze(). Signed-off-by: Fiona Ebner --- New in v2. src/PVE/QMPClient.pm | 2 +- src/PVE/QemuConfig.pm | 4 ++-- src/PVE/QemuServer/Agent.pm | 14 +++++++------- src/PVE/QemuServer/BlockJob.pm | 4 ++-- src/PVE/VZDump/QemuServer.pm | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/PVE/QMPClient.pm b/src/PVE/QMPClient.pm index 723123a6..bb4c5275 100644 --- a/src/PVE/QMPClient.pm +++ b/src/PVE/QMPClient.pm @@ -108,7 +108,7 @@ sub cmd { } elsif ($cmd->{execute} =~ m/^(eject|change)/) { $timeout = 60; # note: cdrom mount command is slow } elsif ($cmd->{execute} eq 'guest-fsfreeze-freeze') { - # consider using the guest_fsfreeze() helper in Agent.pm + # consider using the guest_fs_freeze() helper in Agent.pm # # freeze syncs all guest FS, if we kill it it stays in an unfreezable # locked state with high probability, so use an generous timeout diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm index 839b6cd0..f93ee5bb 100644 --- a/src/PVE/QemuConfig.pm +++ b/src/PVE/QemuConfig.pm @@ -309,10 +309,10 @@ sub __snapshot_freeze { my ($class, $vmid, $unfreeze) = @_; if ($unfreeze) { - eval { PVE::QemuServer::Agent::guest_fsthaw($vmid); }; + eval { PVE::QemuServer::Agent::guest_fs_thaw($vmid); }; warn "guest-fsfreeze-thaw problems - $@" if $@; } else { - eval { PVE::QemuServer::Agent::guest_fsfreeze($vmid); }; + eval { PVE::QemuServer::Agent::guest_fs_freeze($vmid); }; warn $@ if $@; } } diff --git a/src/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm index ec3827d6..a68dd8d7 100644 --- a/src/PVE/QemuServer/Agent.pm +++ b/src/PVE/QemuServer/Agent.pm @@ -193,9 +193,9 @@ sub should_fs_freeze($conf) { return $agent->{'freeze-fs'} // 1; } -=head3 guest_fsfreeze +=head3 guest_fs_freeze - guest_fsfreeze($vmid); + guest_fs_freeze($vmid); Freeze the file systems of the guest C<$vmid>. Check that the guest agent is enabled and running before calling this function. Dies if the file systems cannot be frozen. @@ -216,7 +216,7 @@ the time the socket is blocked after a lost command is at most 10 minutes. =cut -sub guest_fsfreeze($vmid) { +sub guest_fs_freeze($vmid) { my $timeout = 10 * 60; my $result = eval { @@ -259,17 +259,17 @@ sub guest_fsfreeze($vmid) { die "unable to freeze guest fs - unexpected status '$status'\n" if $status ne 'frozen'; } -=head3 guest_fsthaw +=head3 guest_fs_thaw - guest_fsthaw($vmid); + guest_fs_thaw($vmid); Thaws the file systems of the guest C<$vmid>. Dies if the file systems cannot be thawed. -See C<$guest_fsfreeze> for more details. +See C for more details. =cut -sub guest_fsthaw($vmid) { +sub guest_fs_thaw($vmid) { my $res = PVE::QemuServer::Monitor::mon_cmd($vmid, "guest-fsfreeze-thaw"); check_agent_error($res, "unable to thaw guest filesystem"); diff --git a/src/PVE/QemuServer/BlockJob.pm b/src/PVE/QemuServer/BlockJob.pm index d7c78741..2b14a679 100644 --- a/src/PVE/QemuServer/BlockJob.pm +++ b/src/PVE/QemuServer/BlockJob.pm @@ -165,7 +165,7 @@ sub monitor { my $should_fsfreeze = $qga && qga_check_running($vmid); if ($should_fsfreeze) { print "issuing guest agent 'guest-fsfreeze-freeze' command\n"; - eval { PVE::QemuServer::Agent::guest_fsfreeze($vmid); }; + eval { PVE::QemuServer::Agent::guest_fs_freeze($vmid); }; warn $@ if $@; } else { if (!$qga) { @@ -185,7 +185,7 @@ sub monitor { if ($should_fsfreeze) { print "issuing guest agent 'guest-fsfreeze-thaw' command\n"; - eval { PVE::QemuServer::Agent::guest_fsthaw($vmid); }; + eval { PVE::QemuServer::Agent::guest_fs_thaw($vmid); }; warn $@ if $@; } else { print "resume vm\n"; diff --git a/src/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm index 32f92829..ca4a8513 100644 --- a/src/PVE/VZDump/QemuServer.pm +++ b/src/PVE/VZDump/QemuServer.pm @@ -1116,7 +1116,7 @@ sub qga_fs_freeze { } $self->loginfo("issuing guest-agent 'fs-freeze' command"); - eval { PVE::QemuServer::Agent::guest_fsfreeze($vmid); }; + eval { PVE::QemuServer::Agent::guest_fs_freeze($vmid); }; $self->logerr($@) if $@; return 1; # even on error, ensure we always thaw again @@ -1127,7 +1127,7 @@ sub qga_fs_thaw { my ($self, $vmid) = @_; $self->loginfo("issuing guest-agent 'fs-thaw' command"); - eval { PVE::QemuServer::Agent::guest_fsthaw($vmid); }; + eval { PVE::QemuServer::Agent::guest_fs_thaw($vmid); }; $self->logerr($@) if $@; } -- 2.47.3