[PATCH qemu-server 2/7] vm_stop: introduce config_aware_shutdown_timeout helper

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

Factor out the parsing of the shutdown timeout from the VM config in
preparation of a patch, which makes the shutdown timeout of HA resources
consistent with non-HA resources.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/QemuServer.pm         |  5 +----
 src/PVE/QemuServer/Helpers.pm | 13 +++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 5b9f5753..fefaf36c 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -6241,10 +6241,7 @@ sub _do_vm_stop {
     if (!$nocheck) {
         $conf = PVE::QemuConfig->load_config($vmid);
         PVE::QemuConfig->check_lock($conf) if !$skiplock;
-        if (!defined($timeout) && $shutdown && $conf->{startup}) {
-            my $opts = PVE::JSONSchema::pve_parse_startup_order($conf->{startup});
-            $timeout = $opts->{down} if $opts->{down};
-        }
+        $timeout //= PVE::QemuServer::Helpers::config_aware_shutdown_timeout($conf) if $shutdown;
         PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'pre-stop');
     }
 
diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm
index de9bc098..81e42854 100644
--- a/src/PVE/QemuServer/Helpers.pm
+++ b/src/PVE/QemuServer/Helpers.pm
@@ -297,6 +297,19 @@ sub config_aware_start_timeout {
     return $timeout;
 }
 
+sub config_aware_shutdown_timeout {
+    my ($conf) = @_;
+
+    my $timeout = 60;
+
+    if ($conf->{startup}) {
+        my $opts = PVE::JSONSchema::pve_parse_startup_order($conf->{startup});
+        $timeout = $opts->{down} if $opts->{down};
+    }
+
+    return $timeout;
+}
+
 sub get_node_pvecfg_version {
     my ($node) = @_;
 
-- 
2.47.3