vzdump: assemble: fix skipping all pending and snapshot config entries

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

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index 96b6a24296998b4a7b24027ba2f788e8917cfec2..90cba64d61b6941737e9d9678ffd1d72fabe117b 100644 (file)
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -10,7 +10,7 @@ use Scalar::Util qw(weaken);
 use Time::HiRes qw(usleep gettimeofday tv_interval);
 
 use PVE::IPCC;
-use PVE::QemuServer;
+use PVE::QemuServer::Helpers;
 
 # Qemu Monitor Protocol (QMP) client.
 #
@@ -58,7 +58,7 @@ my $push_cmd_to_queue = sub {
 
     my $qga = ($execute =~ /^guest\-+/) ? 1 : 0;
 
-    my $sname = PVE::QemuServer::qmp_socket($vmid, $qga);
+    my $sname = PVE::QemuServer::Helpers::qmp_socket($vmid, $qga);
 
     $self->{queue_info}->{$sname} = { qga => $qga, vmid => $vmid, sname => $sname, cmds => [] }
         if !$self->{queue_info}->{$sname};
@@ -186,7 +186,7 @@ my $open_connection = sub {
     my $vmid = $queue_info->{vmid};
     my $qga = $queue_info->{qga};
 
-    my $sname = PVE::QemuServer::qmp_socket($vmid, $qga);
+    my $sname = PVE::QemuServer::Helpers::qmp_socket($vmid, $qga);
 
     $timeout = 1 if !$timeout;
 
@@ -263,8 +263,8 @@ my $check_queue = sub {
            if ($qga) {
 
                $qmpcmd = to_json({ execute => 'guest-sync-delimited',
-                                   arguments => { id => int($cmd->{id})}}) .
-                   to_json({ execute => $cmd->{execute}, arguments => $cmd->{arguments}});
+                                   arguments => { id => int($cmd->{id})}}) . "\n" .
+                   to_json({ execute => $cmd->{execute}, arguments => $cmd->{arguments}}) . "\n";
 
            } else {