[pve-devel] [PATCH qemu-server 13/31] agent: move qga_check_running() to agent module

[Fiona Ebner <f.ebner@proxmox.com>]

Makes it possible to call into the module from the main QemuServer
module and other modules that are used by QemuServer without adding a
cyclic dependency.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/API2/Qemu.pm         |  5 +++--
 src/PVE/QemuConfig.pm        |  3 ++-
 src/PVE/QemuServer.pm        | 12 +-----------
 src/PVE/QemuServer/Agent.pm  | 15 +++++++++++++--
 src/PVE/VZDump/QemuServer.pm |  3 ++-
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
index 9600cf8d..747edb62 100644
--- a/src/PVE/API2/Qemu.pm
+++ b/src/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);
@@ -4761,7 +4762,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") };
                 }
 
@@ -6623,7 +6624,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/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm
index 20d9d2af..500b4c0b 100644
--- a/src/PVE/QemuConfig.pm
+++ b/src/PVE/QemuConfig.pm
@@ -8,6 +8,7 @@ use Scalar::Util qw(blessed);
 use PVE::AbstractConfig;
 use PVE::INotify;
 use PVE::JSONSchema;
+use PVE::QemuServer::Agent;
 use PVE::QemuServer::CPUConfig;
 use PVE::QemuServer::Drive;
 use PVE::QemuServer::Helpers;
@@ -293,7 +294,7 @@ sub __snapshot_check_freeze_needed {
             $running,
             $running
                 && PVE::QemuServer::parse_guest_agent($config)->{enabled}
-                && PVE::QemuServer::qga_check_running($vmid),
+                && PVE::QemuServer::Agent::qga_check_running($vmid),
         );
     } else {
         return ($running, 0);
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 59958dc0..02dcc02c 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -53,6 +53,7 @@ use PVE::Tools
 use PVE::QMPClient;
 use PVE::QemuConfig;
 use PVE::QemuConfig::NoWrite;
+use PVE::QemuServer::Agent qw(qga_check_running);
 use PVE::QemuServer::Helpers
     qw(config_aware_timeout get_iscsi_initiator_name min_version kvm_user_version windows_version);
 use PVE::QemuServer::Cloudinit;
@@ -7923,17 +7924,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/src/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm
index 719db4b2..ee48e83e 100644
--- a/src/PVE/QemuServer/Agent.pm
+++ b/src/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/src/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm
index 93c55a91..243a927e 100644
--- a/src/PVE/VZDump/QemuServer.pm
+++ b/src/PVE/VZDump/QemuServer.pm
@@ -29,6 +29,7 @@ use PVE::Format qw(render_duration render_bytes);
 
 use PVE::QemuConfig;
 use PVE::QemuServer;
+use PVE::QemuServer::Agent;
 use PVE::QemuServer::Drive qw(checked_volume_format);
 use PVE::QemuServer::Helpers;
 use PVE::QemuServer::Machine;
@@ -1082,7 +1083,7 @@ sub qga_fs_freeze {
         || !$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.47.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel