[PATCH qemu-server 5/8] agent: get qga key: change signature to take property string rather than full VM config

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

Better encapsulation and in preparation to harmonize checks for freeze
while avoiding the need to pass the full config to block jobs.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/API2/Qemu.pm         | 17 +++++++++++------
 src/PVE/QemuConfig.pm        |  4 ++--
 src/PVE/QemuMigrate.pm       |  2 +-
 src/PVE/QemuServer.pm        |  6 +++++-
 src/PVE/QemuServer/Agent.pm  |  6 +++---
 src/PVE/VZDump/QemuServer.pm |  8 ++++----
 6 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
index 1752f46a..841c4830 100644
--- a/src/PVE/API2/Qemu.pm
+++ b/src/PVE/API2/Qemu.pm
@@ -374,8 +374,8 @@ my $import_from_volid = sub {
 
         my ($src_storeid) = PVE::Storage::parse_volume_id($src_volid);
 
-        my $qga = PVE::QemuServer::Agent::get_qga_key($src_conf, 'enabled')
-            && (PVE::QemuServer::Agent::get_qga_key($src_conf, 'guest-fsfreeze') // 1);
+        my $qga = PVE::QemuServer::Agent::get_qga_key($src_conf->{agent}, 'enabled')
+            && (PVE::QemuServer::Agent::get_qga_key($src_conf->{agent}, 'guest-fsfreeze') // 1);
 
         return PVE::QemuServer::clone_disk(
             $storecfg,
@@ -3386,7 +3386,7 @@ __PACKAGE__->register_method({
             $status->{spice} = 1 if $spice;
             $status->{clipboard} = $vga->{clipboard};
         }
-        $status->{agent} = 1 if PVE::QemuServer::Agent::get_qga_key($conf, 'enabled');
+        $status->{agent} = 1 if PVE::QemuServer::Agent::get_qga_key($conf->{agent}, 'enabled');
 
         return $status;
     },
@@ -4562,8 +4562,12 @@ __PACKAGE__->register_method({
                     $dest_info->{efisize} = PVE::QemuServer::get_efivars_size($oldconf)
                         if $opt eq 'efidisk0';
 
-                    my $qga = PVE::QemuServer::Agent::get_qga_key($oldconf, 'enabled')
-                        && (PVE::QemuServer::Agent::get_qga_key($oldconf, 'guest-fsfreeze') // 1);
+                    my $qga = PVE::QemuServer::Agent::get_qga_key($oldconf->{agent}, 'enabled')
+                        && (
+                            PVE::QemuServer::Agent::get_qga_key(
+                                $oldconf->{agent}, 'guest-fsfreeze',
+                            ) // 1
+                        );
 
                     my $newdrive = PVE::QemuServer::clone_disk(
                         $storecfg,
@@ -4861,7 +4865,8 @@ __PACKAGE__->register_method({
 
                 PVE::QemuConfig->write_config($vmid, $conf);
 
-                my $do_trim = PVE::QemuServer::Agent::get_qga_key($conf, 'fstrim_cloned_disks');
+                my $do_trim =
+                    PVE::QemuServer::Agent::get_qga_key($conf->{agent}, 'fstrim_cloned_disks');
                 if ($running && $do_trim && PVE::QemuServer::Agent::qga_check_running($vmid)) {
                     eval { mon_cmd($vmid, "guest-fstrim") };
                 }
diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm
index 462d1d6d..7656134b 100644
--- a/src/PVE/QemuConfig.pm
+++ b/src/PVE/QemuConfig.pm
@@ -297,9 +297,9 @@ sub __snapshot_check_freeze_needed {
         return (
             $running,
             $running
-                && PVE::QemuServer::Agent::get_qga_key($config, 'enabled')
+                && PVE::QemuServer::Agent::get_qga_key($config->{agent}, 'enabled')
                 && PVE::QemuServer::Agent::qga_check_running($vmid)
-                && (PVE::QemuServer::Agent::get_qga_key($config, 'guest-fsfreeze') // 1),
+                && (PVE::QemuServer::Agent::get_qga_key($config->{agent}, 'guest-fsfreeze') // 1),
         );
     } else {
         return ($running, 0);
diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm
index f7ec3227..31070111 100644
--- a/src/PVE/QemuMigrate.pm
+++ b/src/PVE/QemuMigrate.pm
@@ -1752,7 +1752,7 @@ sub phase3_cleanup {
 
         if (
             $self->{storage_migration}
-            && PVE::QemuServer::Agent::get_qga_key($conf, 'fstrim_cloned_disks')
+            && PVE::QemuServer::Agent::get_qga_key($conf->{agent}, 'fstrim_cloned_disks')
             && $self->{running}
         ) {
             if (!$self->{vm_was_paused}) {
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index e94dae0d..039b6a8c 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -6181,7 +6181,11 @@ sub _do_vm_stop {
 
     eval {
         if ($shutdown) {
-            if (defined($conf) && get_qga_key($conf, 'enabled') && qga_check_running($vmid)) {
+            if (
+                defined($conf)
+                && get_qga_key($conf->{agent}, 'enabled')
+                && qga_check_running($vmid)
+            ) {
                 mon_cmd($vmid, "guest-shutdown", timeout => $timeout);
             } else {
                 mon_cmd($vmid, "system_powerdown");
diff --git a/src/PVE/QemuServer/Agent.pm b/src/PVE/QemuServer/Agent.pm
index 974e282e..2c1f580d 100644
--- a/src/PVE/QemuServer/Agent.pm
+++ b/src/PVE/QemuServer/Agent.pm
@@ -81,10 +81,10 @@ sub parse_guest_agent {
 }
 
 sub get_qga_key {
-    my ($conf, $key) = @_;
-    return undef if !defined($conf->{agent});
+    my ($agent_str, $key) = @_;
+    return undef if !defined($agent_str);
 
-    my $agent = parse_guest_agent($conf->{agent});
+    my $agent = parse_guest_agent($agent_str);
     return $agent->{$key};
 }
 
diff --git a/src/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm
index 0681661d..ed63e3c2 100644
--- a/src/PVE/VZDump/QemuServer.pm
+++ b/src/PVE/VZDump/QemuServer.pm
@@ -1096,9 +1096,9 @@ sub qga_fs_freeze {
         || !$self->{vm_was_running}
         || $self->{vm_was_paused};
 
-    my $conf = $self->{vmlist}->{$vmid};
+    my $agent_str = $self->{vmlist}->{$vmid}->{agent};
 
-    if (!PVE::QemuServer::Agent::get_qga_key($conf, 'enabled')) {
+    if (!PVE::QemuServer::Agent::get_qga_key($agent_str, 'enabled')) {
         $self->loginfo("skipping guest-agent 'fs-freeze', agent not configured in VM options");
         return;
     }
@@ -1108,8 +1108,8 @@ sub qga_fs_freeze {
         return;
     }
 
-    my $freeze = PVE::QemuServer::Agent::get_qga_key($conf, 'guest-fsfreeze');
-    $freeze //= PVE::QemuServer::Agent::get_qga_key($conf, 'freeze-fs-on-backup');
+    my $freeze = PVE::QemuServer::Agent::get_qga_key($agent_str, 'guest-fsfreeze');
+    $freeze //= PVE::QemuServer::Agent::get_qga_key($agent_str, 'freeze-fs-on-backup');
     $freeze //= 1;
 
     if (!$freeze) {
-- 
2.47.3