qmpclient-qga : mux_input : parse qga result

[qemu-server.git] / PVE / QMPClient.pm

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index 648c51ae956214a5072c9e1138ec20ab40663608..51f7c185d6f5821d8c6d8bc1ef12a143518f82f9 100755 (executable)
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -189,10 +189,27 @@ my $check_queue = sub {
                delete $cmd->{arguments}->{fd};
            }
 
-           my $qmpcmd = to_json({
-               execute => $cmd->{execute},
-               arguments => $cmd->{arguments},
-               id => $cmd->{id}});
+           my $qmpcmd = undef;
+
+           if($self->{qga}){
+
+               my $qmpcmdid =to_json({
+                   execute => 'guest-sync',
+                   arguments => { id => int($cmd->{id})}});
+
+               $qmpcmd = to_json({
+                   execute => $cmd->{execute},
+                   arguments => $cmd->{arguments}});
+
+               $qmpcmd = $qmpcmdid.$qmpcmd;
+
+           }else{
+
+               $qmpcmd = to_json({
+                   execute => $cmd->{execute},
+                   arguments => $cmd->{arguments},
+                   id => $cmd->{id}});
+           }
 
            if ($fd >= 0) {
                my $ret = PVE::IPCC::sendfd(fileno($fh), $fd, $qmpcmd);
@@ -228,8 +245,12 @@ sub queue_execute {
 
        eval {
            my $fh = &$open_connection($self, $vmid, $timeout);
-           my $cmd = { execute => 'qmp_capabilities', arguments => {} };
-           unshift @{$self->{queue}->{$vmid}}, $cmd;
+
+           if(!$self->{qga}){
+               my $cmd = { execute => 'qmp_capabilities', arguments => {} };
+               unshift @{$self->{queue}->{$vmid}}, $cmd;
+           }
+
            $self->{mux}->set_timeout($fh, $timeout);
        };
        if (my $err = $@) {
@@ -271,9 +292,15 @@ sub mux_close {
 sub mux_input {
     my ($self, $mux, $fh, $input) = @_;
 
-    return if $$input !~ s/^(.*})\r\n(.*)$/$2/so;
+    my $raw;
 
-    my $raw = $1;
+    if($self->{qga}){
+       return if $$input !~ s/^([^\n]+}\n[^\n]+})\n(.*)$/$2/so;
+       $raw = $1;
+    }else{
+       return if $$input !~ s/^([^\n]+})\r?\n(.*)$/$2/so;
+       $raw = $1;
+    }
 
     my $vmid = $self->{fhs_lookup}->{$fh};
     if (!$vmid) {
@@ -284,6 +311,32 @@ sub mux_input {
     eval {
        my @jsons = split("\n", $raw);
 
+       if($self->{qga}){
+
+           die "response is not complete" if @jsons != 2 ;
+
+           my $obj = from_json($jsons[0]);
+           my $cmdid = $obj->{return};
+           die "received responsed without command id\n" if !$cmdid;
+
+           my $curcmd = $self->{current}->{$vmid};
+           die "unable to lookup current command for VM $vmid\n" if !$curcmd;
+
+           delete $self->{current}->{$vmid};
+
+           if ($curcmd->{id} ne $cmdid) {
+               die "got wrong command id '$cmdid' (expected $curcmd->{id})\n";
+           }
+
+           $obj = from_json($jsons[1]);
+
+           if (my $callback = $curcmd->{callback}) {
+               &$callback($vmid, $obj);
+           }
+
+           return;
+       }
+
        foreach my $json (@jsons) {
            my $obj = from_json($json);
            next if defined($obj->{QMP}); # skip monitor greeting