[pve-devel] [PATCH qemu-server v3] return error from guest-agent

[Dominik Csapak]

in case of e.g. a non-existant guest-agent command, it would return
{ error: {someerrorobject} }
but we did only include the 'return' property

in case we do not get any and the error property is set,
return that

i looked at all the paths were we use the QMPClient, and either
we have our own callback for the result,
or we do not rely on the result being empty upon an error, so this
should not break anything

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
changes from v2:
* changed !$result to !defined($result) to skip error on empty string for result
* remove comment
 PVE/QMPClient.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index 9e32533..2277fef 100755
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -92,6 +92,7 @@ sub cmd {
     my $callback = sub {
 	my ($vmid, $resp) = @_;
 	$result = $resp->{'return'};
+	$result = { error => $resp->{'error'} } if !defined($result) && $resp->{'error'};
     };
 
     die "no command specified" if !($cmd && $cmd->{execute});
-- 
2.11.0