]> git.proxmox.com Git - pve-qemu.git/blob - debian/patches/pve/0048-PVE-savevm-async-register-yank-before-migration_inco.patch
update and rebase to QEMU v6.1.0
[pve-qemu.git] / debian / patches / pve / 0048-PVE-savevm-async-register-yank-before-migration_inco.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Stefan Reiter <s.reiter@proxmox.com>
3 Date: Wed, 26 May 2021 17:36:55 +0200
4 Subject: [PATCH] PVE: savevm-async: register yank before
5 migration_incoming_state_destroy
6
7 Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
8 ---
9 migration/savevm-async.c | 5 +++++
10 1 file changed, 5 insertions(+)
11
12 diff --git a/migration/savevm-async.c b/migration/savevm-async.c
13 index 970ee3b3fc..b3ccc069f1 100644
14 --- a/migration/savevm-async.c
15 +++ b/migration/savevm-async.c
16 @@ -19,6 +19,7 @@
17 #include "qemu/timer.h"
18 #include "qemu/main-loop.h"
19 #include "qemu/rcu.h"
20 +#include "qemu/yank.h"
21
22 /* #define DEBUG_SAVEVM_STATE */
23
24 @@ -580,6 +581,10 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
25 dirty_bitmap_mig_before_vm_start();
26
27 qemu_fclose(f);
28 +
29 + /* state_destroy assumes a real migration which would have added a yank */
30 + yank_register_instance(MIGRATION_YANK_INSTANCE, &error_abort);
31 +
32 migration_incoming_state_destroy();
33 if (ret < 0) {
34 error_setg_errno(errp, -ret, "Error while loading VM state");