[PATCH qemu-server] fix #7697: snapshot hook name mismatch

[PATCH qemu-server] fix #7697: snapshot hook name mismatch

[Jakob Klocker]

pve-guest-common invokes the snapshot hook with the name
"after-unfreeze" [0], but qemu-server checks for "after-freeze" [1].

As a result, the post-unfreeze hook is never executed and the
query-savevm polling loop intended to wait for savevm-end cleanup
is skipped.

[0] https://git.proxmox.com/?p=pve-guest-common.git;a=blob;f=src/PVE/AbstractConfig.pm;h=7bcae1943094f99e98a8ba19428e1f90d4936080;hb=572ed3533d5ba75e82a5a0e367e2db1aff290c09#l868
[1] https://git.proxmox.com/?p=qemu-server.git;a=blob;f=src/PVE/QemuConfig.pm;h=80a3999e85886b603bdb1b5a8d3d2b3887dff369;hb=bef9334af96eb30cab8d1f5c41c0974eaf0bbdc4#l374

Link: https://bugzilla.proxmox.com/show_bug.cgi?id=7697
Signed-off-by: Jakob Klocker <j.klocker@proxmox.com>
---
 src/PVE/QemuConfig.pm     | 2 +-
 src/test/snapshot-test.pm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm
index 80a3999e..c24eb835 100644
--- a/src/PVE/QemuConfig.pm
+++ b/src/PVE/QemuConfig.pm
@@ -371,7 +371,7 @@ sub __snapshot_create_vol_snapshots_hook {
                     if $snap->{vmstate};
             };
             warn $@ if $@;
-        } elsif ($hook eq "after-freeze") {
+        } elsif ($hook eq "after-unfreeze") {
             # savevm-end is async, we need to wait
             for (;;) {
                 my $stat = mon_cmd($vmid, "query-savevm");
diff --git a/src/test/snapshot-test.pm b/src/test/snapshot-test.pm
index e28107b9..3e3b9412 100644
--- a/src/test/snapshot-test.pm
+++ b/src/test/snapshot-test.pm
@@ -379,12 +379,13 @@ sub qmp_cmd {
     if ($exec eq "savevm-end") {
         die "savevm-end disabled\n"
             if !$vm_mon->{savevm_end};
+        $vm_mon->{savevm_ended} = 1;
         return;
     }
     if ($exec eq "query-savevm") {
         return {
             "status" => "completed",
-            "bytes" => 1024 * 1024 * 1024,
+            "bytes" => $vm_mon->{savevm_ended} ? 0 : 1024 * 1024 * 1024,
             "total-time" => 5000,
         };
     }
-- 
2.47.3