f376b2b9e2
Very clean rebase, only the +pve version handling needed manual fixing. Drops two applied patches from extra/ and adds one new from upstream (extra/0001*, fixes VNC over unix sockets) as well as 3 of my own for allowing password changes on custom VNC displays again (as seen and reviewed upstream, but not yet applied). Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
|
Date: Wed, 26 May 2021 17:36:55 +0200
|
|
Subject: [PATCH] PVE: savevm-async: register yank before
|
|
migration_incoming_state_destroy
|
|
|
|
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
|
---
|
|
migration/savevm-async.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/migration/savevm-async.c b/migration/savevm-async.c
|
|
index 970ee3b3fc..b3ccc069f1 100644
|
|
--- a/migration/savevm-async.c
|
|
+++ b/migration/savevm-async.c
|
|
@@ -19,6 +19,7 @@
|
|
#include "qemu/timer.h"
|
|
#include "qemu/main-loop.h"
|
|
#include "qemu/rcu.h"
|
|
+#include "qemu/yank.h"
|
|
|
|
/* #define DEBUG_SAVEVM_STATE */
|
|
|
|
@@ -580,6 +581,10 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
|
|
dirty_bitmap_mig_before_vm_start();
|
|
|
|
qemu_fclose(f);
|
|
+
|
|
+ /* state_destroy assumes a real migration which would have added a yank */
|
|
+ yank_register_instance(MIGRATION_YANK_INSTANCE, &error_abort);
|
|
+
|
|
migration_incoming_state_destroy();
|
|
if (ret < 0) {
|
|
error_setg_errno(errp, -ret, "Error while loading VM state");
|