On 6/25/19 4:44 PM, Stefan Reiter wrote: > 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.rei...@proxmox.com> > --- > PVE/QemuServer.pm | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index bf71210..fbfc3fb 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -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 { >
applied, thanks! _______________________________________________ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
