From 8e0c97bbbf8e91306a99b8b98d81d0018f8a7029 Mon Sep 17 00:00:00 2001
From: Stefan Reiter <s.reiter@proxmox.com>
Date: Mon, 19 Oct 2020 14:18:41 +0200
Subject: [PATCH] fix vm_resume and allow vm_start with QMP status 'shutdown'

When the VM is in status 'shutdown', i.e. after the guest issues a
powerdown while a backup is running, QEMU requires a 'system_reset' to
be issued before 'cont' can boot the guest again.

Additionally, when the VM has been powered down during a backup, the
logically correct call would be a 'vm_start', so automatically vm_resume
from vm_start in case this situation occurs. This also means the GUI can
cope with this almost unchanged.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
 PVE/QemuServer.pm | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 3d597035..34b54d3b 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4860,13 +4860,22 @@ sub vm_start {
 	    if !$params->{skiptemplate} && PVE::QemuConfig->is_template($conf);
 
 	my $has_suspended_lock = PVE::QemuConfig->has_lock($conf, 'suspended');
+	my $has_backup_lock = PVE::QemuConfig->has_lock($conf, 'backup');
+
+	my $running = check_running($vmid, undef, $migrate_opts->{migratedfrom});
+
+	if ($has_backup_lock && $running) {
+	    # a backup is currently running, attempt to start the guest in the
+	    # existing QEMU instance
+	    return vm_resume($vmid);
+	}
 
 	PVE::QemuConfig->check_lock($conf)
 	    if !($params->{skiplock} || $has_suspended_lock);
 
 	$params->{resume} = $has_suspended_lock || defined($conf->{vmstate});
 
-	die "VM $vmid already running\n" if check_running($vmid, undef, $migrate_opts->{migratedfrom});
+	die "VM $vmid already running\n" if $running;
 
 	if (my $storagemap = $migrate_opts->{storagemap}) {
 	    my $replicated = $migrate_opts->{replicated_volumes};
@@ -5546,9 +5555,12 @@ sub vm_resume {
     PVE::QemuConfig->lock_config($vmid, sub {
 	my $res = mon_cmd($vmid, 'query-status');
 	my $resume_cmd = 'cont';
+	my $reset = 0;
 
-	if ($res->{status} && $res->{status} eq 'suspended') {
-	    $resume_cmd = 'system_wakeup';
+	if ($res->{status}) {
+	    return if $res->{status} eq 'running'; # job done, go home
+	    $resume_cmd = 'system_wakeup' if $res->{status} eq 'suspended';
+	    $reset = 1 if $res->{status} eq 'shutdown';
 	}
 
 	if (!$nocheck) {
@@ -5559,6 +5571,11 @@ sub vm_resume {
 		if !($skiplock || PVE::QemuConfig->has_lock($conf, 'backup'));
 	}
 
+	if ($reset) {
+	    # required if a VM shuts down during a backup and we get a resume
+	    # request before the backup finishes for example
+	    mon_cmd($vmid, "system_reset");
+	}
 	mon_cmd($vmid, $resume_cmd);
     });
 }