[PATCH qemu-server 5/7] fix #7230: api: vm_shutdown: make HA resources acknowledge config timeout

[Daniel Kral <d.kral@proxmox.com>]

Allow users to configure the shutdown timeout of HA resources by
acknowledging the shutdown timeout value from the VM config.

This does only partially fix #7230 as HA resources are still
force-stopped as the LRM will always set the flag.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/API2/Qemu.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
index 304805dc..2613aea0 100644
--- a/src/PVE/API2/Qemu.pm
+++ b/src/PVE/API2/Qemu.pm
@@ -3899,6 +3899,12 @@ __PACKAGE__->register_method({
         raise_param_exc({ keepActive => "Only root may use this option." })
             if $keepActive && $authuser ne 'root@pam';
 
+        my $timeout = extract_param($param, 'timeout');
+        if (!defined($timeout)) {
+            my $conf = PVE::QemuConfig->load_config($vmid);
+            $timeout = PVE::QemuServer::Helpers::config_aware_shutdown_timeout($conf);
+        }
+
         my $storecfg = PVE::Storage::config();
 
         my $shutdown = 1;
@@ -3916,7 +3922,6 @@ __PACKAGE__->register_method({
 
         if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
 
-            my $timeout = $param->{timeout} // 60;
             my $hacmd = sub {
                 my $upid = shift;
 
@@ -3941,7 +3946,7 @@ __PACKAGE__->register_method({
                     $vmid,
                     $skiplock,
                     0,
-                    $param->{timeout},
+                    $timeout,
                     $shutdown,
                     $param->{forceStop},
                     $keepActive,
-- 
2.47.3