suspend: continue cleanup even if savevm-end QMP command fails

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

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index 9805c20600649579f6276d23c4387d7d044dda0c..a785d9a146e9bcc42c82a990a62a24fe6c10bd82 100644 (file)
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use IO::Multiplex;
+use IO::Socket::UNIX;
 use JSON;
 use POSIX qw(EINTR EAGAIN);
 use Scalar::Util qw(weaken);
@@ -12,7 +13,7 @@ use Time::HiRes qw(usleep gettimeofday tv_interval);
 use PVE::IPCC;
 use PVE::QemuServer::Helpers;
 
-# Qemu Monitor Protocol (QMP) client.
+# QEMU Monitor Protocol (QMP) client.
 #
 # This implementation uses IO::Multiplex (libio-multiplex-perl) and
 # allows you to issue qmp and qga commands to different VMs in parallel.
@@ -118,22 +119,21 @@ sub cmd {
            # that are executed upon thaw, so use 3 minutes to be on the safe side.
            $timeout = 3 * 60;
        } elsif (
-           $cmd->{execute} eq 'savevm-start' ||
-           $cmd->{execute} eq 'savevm-end' ||
-           $cmd->{execute} eq 'query-backup' ||
-           $cmd->{execute} eq 'query-block-jobs' ||
+           $cmd->{execute} eq 'backup-cancel' ||
+           $cmd->{execute} eq 'blockdev-snapshot-delete-internal-sync' ||
+           $cmd->{execute} eq 'blockdev-snapshot-internal-sync' ||
            $cmd->{execute} eq 'block-job-cancel' ||
            $cmd->{execute} eq 'block-job-complete' ||
-           $cmd->{execute} eq 'backup-cancel' ||
-           $cmd->{execute} eq 'query-savevm' ||
-           $cmd->{execute} eq 'delete-drive-snapshot' ||
+           $cmd->{execute} eq 'drive-mirror' ||
            $cmd->{execute} eq 'guest-fstrim' ||
            $cmd->{execute} eq 'guest-shutdown' ||
-           $cmd->{execute} eq 'blockdev-snapshot-internal-sync' ||
-           $cmd->{execute} eq 'blockdev-snapshot-delete-internal-sync' ||
-           $cmd->{execute} eq 'snapshot-drive'
+           $cmd->{execute} eq 'query-backup' ||
+           $cmd->{execute} eq 'query-block-jobs' ||
+           $cmd->{execute} eq 'query-savevm' ||
+           $cmd->{execute} eq 'savevm-end' ||
+           $cmd->{execute} eq 'savevm-start'
         ) {
-           $timeout = 10*60; # 10 mins ?
+           $timeout = 10*60; # 10 mins
        } else {
            #  NOTE: if you came here as user and want to change this, try using IO-Threads first
            # which move out quite some processing of the main thread, leaving more time for QMP