|
 |
127bba |
From db226bbecedc7873a71f202fd01c24ba086235f1 Mon Sep 17 00:00:00 2001
|
|
|
127bba |
Message-Id: <db226bbecedc7873a71f202fd01c24ba086235f1@dist-git>
|
|
|
127bba |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
127bba |
Date: Wed, 2 Nov 2016 14:20:42 +0100
|
|
|
127bba |
Subject: [PATCH] qemu: Reset post-copy capability after migration
|
|
|
127bba |
|
|
|
127bba |
Unlike other migration capabilities, post-copy is also set on the
|
|
|
127bba |
destination host which means it doesn't disappear once domain is
|
|
|
127bba |
migrated. As a result of that other functionality which internally uses
|
|
|
127bba |
migration to a file (virDomainManagedSave, virDomainSave,
|
|
|
127bba |
virDomainCoreDump) may fail after migration because the post-copy
|
|
|
127bba |
capability is still set.
|
|
|
127bba |
|
|
|
127bba |
https://bugzilla.redhat.com/show_bug.cgi?id=1374718
|
|
|
127bba |
|
|
|
127bba |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
127bba |
(cherry picked from commit fe1dd39087ae9a49888bc72dee38ff0e6f639693)
|
|
|
127bba |
|
|
|
127bba |
https://bugzilla.redhat.com/show_bug.cgi?id=1392030
|
|
|
127bba |
|
|
|
127bba |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
127bba |
---
|
|
|
127bba |
src/qemu/qemu_migration.c | 3 +++
|
|
|
127bba |
1 file changed, 3 insertions(+)
|
|
|
127bba |
|
|
|
127bba |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
127bba |
index 7426bfd..496a3f1 100644
|
|
|
127bba |
--- a/src/qemu/qemu_migration.c
|
|
|
127bba |
+++ b/src/qemu/qemu_migration.c
|
|
|
127bba |
@@ -6401,6 +6401,9 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
|
|
|
127bba |
*/
|
|
|
127bba |
if (inPostCopy)
|
|
|
127bba |
VIR_FREE(priv->job.completed);
|
|
|
127bba |
+
|
|
|
127bba |
+ qemuMigrationSetPostCopy(driver, vm, false,
|
|
|
127bba |
+ QEMU_ASYNC_JOB_MIGRATION_IN);
|
|
|
127bba |
}
|
|
|
127bba |
|
|
|
127bba |
qemuMigrationJobFinish(driver, vm);
|
|
|
127bba |
--
|
|
|
127bba |
2.10.2
|
|
|
127bba |
|