]> git.proxmox.com Git - qemu-server.git/commitdiff
Fix guest agent shutdown without timeout
authorStefan Reiter <s.reiter@proxmox.com>
Tue, 25 Jun 2019 14:44:31 +0000 (16:44 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 25 Jun 2019 14:52:24 +0000 (16:52 +0200)
Regression from change allowing timeouts to be set, now shutting down
also works without timeouts again (previously qmp failed because of
the unknown "timeout" parameter passed to it).

We always delete the timeout value from the arguments, regardless of
truthiness. "delete" returns the deleted element, deleting a
non-existant hash entry returns undef, which is fine after this point:

"deleting non-existent elements returns the undefined value in their
corresponding positions."
- https://perldoc.perl.org/functions/delete.html

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
PVE/QemuServer.pm

index bf71210ccd724cff7bb728804d3a92ad52bb53ab..fbfc3fbab523c427d1093744b9ae490a81d2661b 100644 (file)
@@ -5485,9 +5485,8 @@ sub vm_qmp_command {
     my $res;
 
     my $timeout;
-    if ($cmd->{arguments} && $cmd->{arguments}->{timeout}) {
-       $timeout = $cmd->{arguments}->{timeout};
-       delete $cmd->{arguments}->{timeout};
+    if ($cmd->{arguments}) {
+       $timeout = delete $cmd->{arguments}->{timeout};
     }
 
     eval {