[PATCH qemu-server 6/7] api: vm_reboot: initialize the config-aware timeout in API handler

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

As vm_reboot() is the only remaining caller which depends on
_do_vm_stop() to acknowledge the shutdown timeout from the VM config,
move the behavior to the API handler and remove it from _do_vm_stop().

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

diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
index 2613aea0..a380cfc1 100644
--- a/src/PVE/API2/Qemu.pm
+++ b/src/PVE/API2/Qemu.pm
@@ -4002,6 +4002,12 @@ __PACKAGE__->register_method({
         my $node = extract_param($param, 'node');
         my $vmid = extract_param($param, 'vmid');
 
+        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);
+        }
+
         die "VM is paused - cannot shutdown\n" if PVE::QemuServer::vm_is_paused($vmid, 1);
 
         die "VM $vmid not running\n" if !PVE::QemuServer::check_running($vmid);
@@ -4010,7 +4016,7 @@ __PACKAGE__->register_method({
             my $upid = shift;
 
             syslog('info', "requesting reboot of VM $vmid: $upid\n");
-            PVE::QemuServer::vm_reboot($vmid, $param->{timeout});
+            PVE::QemuServer::vm_reboot($vmid, $timeout);
             return;
         };
 
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index fefaf36c..1f2bc424 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -6241,7 +6241,6 @@ sub _do_vm_stop {
     if (!$nocheck) {
         $conf = PVE::QemuConfig->load_config($vmid);
         PVE::QemuConfig->check_lock($conf) if !$skiplock;
-        $timeout //= PVE::QemuServer::Helpers::config_aware_shutdown_timeout($conf) if $shutdown;
         PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'pre-stop');
     }
 
-- 
2.47.3