[PATCH qemu-server v2 5/8] fix #7213: qm: cleanup: add `reset` parameter to honor `powercycle`

[Jakob Klocker <j.klocker@proxmox.com>]

With `-no-reboot`, QEMU exits on a guest-initiated reset exactly like it
does on a regular shutdown, so `qm cleanup` cannot tell the two apart on
its own. Add an optional 'reset' parameter which qmeventd sets
accordingly.

Start the VM again if the shutdown was caused by a reset and either
`powercycle` is set or the reset was requested via QMP (`qm reset`,
API), in addition to the existing case of an explicit reboot request.
`powercycle` and reboot requests stay gated on `enabled`, so a guest
reboot with reboot disabled always leaves the VM off. An explicit
`qm reset` restarts the VM regardless, as that is the natural
expectation.

Link: https://bugzilla.proxmox.com/show_bug.cgi?id=7213
Signed-off-by: Jakob Klocker <j.klocker@proxmox.com>
---
 src/PVE/CLI/qm.pm | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/PVE/CLI/qm.pm b/src/PVE/CLI/qm.pm
index f35b8a30..bc9cc6a9 100755
--- a/src/PVE/CLI/qm.pm
+++ b/src/PVE/CLI/qm.pm
@@ -1078,6 +1078,15 @@ __PACKAGE__->register_method({
                 description =>
                     "Indicates if the shutdown was requested by the guest or via qmp.",
             },
+            reset => {
+                type => 'boolean',
+                description =>
+                    "Indicates if the shutdown was caused by a reset request, either from"
+                    . " inside the guest or through QMP, which QEMU turns into a shutdown"
+                    . " when started with '-no-reboot'.",
+                optional => 1,
+                default => 0,
+            },
         },
     },
     returns => { type => 'null' },
@@ -1087,6 +1096,7 @@ __PACKAGE__->register_method({
         my $vmid = $param->{vmid};
         my $clean = $param->{'clean-shutdown'};
         my $guest = $param->{'guest-requested'};
+        my $reset = $param->{reset};
         my $restart = 0;
 
         # return if we do not have the config anymore
@@ -1149,7 +1159,7 @@ __PACKAGE__->register_method({
 
                 my $can_use_cleanup_flag = PVE::QemuServer::RunState::can_use_cleanup_flag();
 
-                if (!$clean || $guest || $can_use_cleanup_flag) {
+                if (!$clean || $guest || $can_use_cleanup_flag || $reset) {
                     # either we can use the new mechanism to check if cleanup is done, or
                     # vm was shutdown from inside the guest or crashed
                     PVE::QemuServer::vm_stop_cleanup($storecfg, $vmid, $conf, 0, 0, 1);
@@ -1160,9 +1170,15 @@ __PACKAGE__->register_method({
                     PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'post-stop');
                 }
 
+                my $reboot = PVE::QemuServer::parse_reboot($conf->{reboot});
+                my $reboot_enabled = $reboot->{enabled} // 1;
+                my $powercycle = $reboot_enabled && $reboot->{powercycle};
+
                 my $reboot_requested = eval { PVE::QemuServer::clear_reboot_request($vmid) };
                 warn $@ if $@;
-                $restart = $reboot_requested && ($conf->{reboot} // 1);
+
+                $restart = ($reset && ($powercycle || !$guest))
+                    || ($reboot_requested && $reboot_enabled);
             },
         );
 
@@ -1473,7 +1489,9 @@ our $cmddef = {
 
     importovf => [__PACKAGE__, 'importovf', ['vmid', 'manifest', 'storage']],
 
-    cleanup => [__PACKAGE__, 'cleanup', ['vmid', 'clean-shutdown', 'guest-requested'], {%node}],
+    cleanup => [
+        __PACKAGE__, 'cleanup', ['vmid', 'clean-shutdown', 'guest-requested', 'reset'], {%node},
+    ],
 
     cloudinit => {
         dump => [
-- 
2.47.3