From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id EF84E1FF162
for <inbox@lore.proxmox.com>; Mon, 5 May 2025 14:59:06 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id DCC3F1C7B4;
Mon, 5 May 2025 14:58:31 +0200 (CEST)
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 5 May 2025 14:57:22 +0200
Message-Id: <20250505125724.75620-10-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250505125724.75620-1-f.ebner@proxmox.com>
References: <20250505125724.75620-1-f.ebner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.036 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
Subject: [pve-devel] [PATCH qemu-server 09/11] agent: move
qga_check_running() helper to agent module
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Removes the dependency on PVE::QemuServer in the agent module. This
makes it possible to use the agent module from nearly everywhere
without introducing a(n indirect) cyclic dependency.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
PVE/API2/Qemu.pm | 5 +++--
PVE/QemuConfig.pm | 4 ++--
PVE/QemuServer.pm | 13 +------------
PVE/QemuServer/Agent.pm | 15 +++++++++++++--
PVE/VZDump/QemuServer.pm | 2 +-
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 626cce45..48a9b75a 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -27,6 +27,7 @@ use PVE::GuestHelpers qw(assert_tag_permissions);
use PVE::GuestImport;
use PVE::QemuConfig;
use PVE::QemuServer;
+use PVE::QemuServer::Agent;
use PVE::QemuServer::Cloudinit;
use PVE::QemuServer::CPUConfig;
use PVE::QemuServer::Drive qw(checked_volume_format checked_parse_volname);
@@ -4436,7 +4437,7 @@ __PACKAGE__->register_method({
PVE::QemuConfig->write_config($vmid, $conf);
my $do_trim = PVE::QemuServer::get_qga_key($conf, 'fstrim_cloned_disks');
- if ($running && $do_trim && PVE::QemuServer::qga_check_running($vmid)) {
+ if ($running && $do_trim && PVE::QemuServer::Agent::qga_check_running($vmid)) {
eval { mon_cmd($vmid, "guest-fstrim") };
}
@@ -6212,7 +6213,7 @@ __PACKAGE__->register_method({
return $info;
},
'fstrim' => sub {
- if (PVE::QemuServer::qga_check_running($state->{vmid})) {
+ if (PVE::QemuServer::Agent::qga_check_running($state->{vmid})) {
eval { mon_cmd($state->{vmid}, "guest-fstrim") };
warn "fstrim failed: $@\n" if $@;
}
diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm
index e941f093..2ee615fa 100644
--- a/PVE/QemuConfig.pm
+++ b/PVE/QemuConfig.pm
@@ -8,7 +8,7 @@ use Scalar::Util qw(blessed);
use PVE::AbstractConfig;
use PVE::INotify;
use PVE::JSONSchema;
-use PVE::QemuServer::Agent;
+use PVE::QemuServer::Agent qw(qga_check_running);
use PVE::QemuServer::CPUConfig;
use PVE::QemuServer::Drive;
use PVE::QemuServer::Helpers;
@@ -279,7 +279,7 @@ sub __snapshot_check_freeze_needed {
my $running = $class->__snapshot_check_running($vmid);
if (!$save_vmstate) {
- return ($running, $running && PVE::QemuServer::parse_guest_agent($config)->{enabled} && PVE::QemuServer::qga_check_running($vmid));
+ return ($running, $running && PVE::QemuServer::parse_guest_agent($config)->{enabled} && qga_check_running($vmid));
} else {
return ($running, 0);
}
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 317c09f2..9a81030e 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -51,7 +51,7 @@ use PVE::Tools qw(run_command file_read_firstline file_get_contents dir_glob_for
use PVE::QMPClient;
use PVE::QemuConfig;
use PVE::QemuConfig::NoWrite;
-use PVE::QemuServer::Agent;
+use PVE::QemuServer::Agent qw(qga_check_running);
use PVE::QemuServer::Helpers qw(config_aware_timeout min_version kvm_user_version windows_version);
use PVE::QemuServer::Cloudinit;
use PVE::QemuServer::CGroup;
@@ -7946,17 +7946,6 @@ sub do_snapshots_with_qemu {
return;
}
-sub qga_check_running {
- my ($vmid, $nowarn) = @_;
-
- eval { mon_cmd($vmid, "guest-ping", timeout => 3); };
- if ($@) {
- warn "QEMU Guest Agent is not running - $@" if !$nowarn;
- return 0;
- }
- return 1;
-}
-
=head3 template_create($vmid, $conf [, $disk])
Converts all used disk volumes for the VM with the identifier C<$vmid> and
diff --git a/PVE/QemuServer/Agent.pm b/PVE/QemuServer/Agent.pm
index 92e02645..9f1450ff 100644
--- a/PVE/QemuServer/Agent.pm
+++ b/PVE/QemuServer/Agent.pm
@@ -6,7 +6,6 @@ use warnings;
use JSON;
use MIME::Base64 qw(decode_base64 encode_base64);
-use PVE::QemuServer;
use PVE::QemuServer::Helpers;
use PVE::QemuServer::Monitor;
@@ -15,8 +14,20 @@ use base 'Exporter';
our @EXPORT_OK = qw(
check_agent_error
agent_cmd
+qga_check_running
);
+sub qga_check_running {
+ my ($vmid, $nowarn) = @_;
+
+ eval { PVE::QemuServer::Monitor::mon_cmd($vmid, "guest-ping", timeout => 3); };
+ if ($@) {
+ warn "QEMU Guest Agent is not running - $@" if !$nowarn;
+ return 0;
+ }
+ return 1;
+}
+
sub check_agent_error {
my ($result, $errmsg, $noerr) = @_;
@@ -43,7 +54,7 @@ sub assert_agent_available {
die "No QEMU guest agent configured\n" if !defined($conf->{agent});
die "VM $vmid is not running\n" if !PVE::QemuServer::Helpers::vm_running_locally($vmid);
- die "QEMU guest agent is not running\n" if !PVE::QemuServer::qga_check_running($vmid, 1);
+ die "QEMU guest agent is not running\n" if !qga_check_running($vmid, 1);
}
# loads config, checks if available, executes command, checks for errors
diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index b686da84..80038d8f 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -1058,7 +1058,7 @@ sub qga_fs_freeze {
my ($self, $task, $vmid) = @_;
return if !$self->{vmlist}->{$vmid}->{agent} || $task->{mode} eq 'stop' || !$self->{vm_was_running} || $self->{vm_was_paused};
- if (!PVE::QemuServer::qga_check_running($vmid, 1)) {
+ if (!PVE::QemuServer::Agent::qga_check_running($vmid, 1)) {
$self->loginfo("skipping guest-agent 'fs-freeze', agent configured but not running?");
return;
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel