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.eb...@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
