|
 |
6ae9ed |
From dd980e5643963822af2eccc5548e7b53f21576b6 Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <dd980e5643963822af2eccc5548e7b53f21576b6@dist-git>
|
|
|
6ae9ed |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6ae9ed |
Date: Thu, 8 Sep 2016 15:22:28 +0200
|
|
|
6ae9ed |
Subject: [PATCH] qemu: Remove stale transient def when migration fails
|
|
|
6ae9ed |
|
|
|
6ae9ed |
If a migration of a domain which is already defined on the destination
|
|
|
6ae9ed |
host failed early (before we tried to start QEMU), we would forget to
|
|
|
6ae9ed |
remove the incoming transient definition. Later on when someone starts
|
|
|
6ae9ed |
the domain on the destination host, we will use the stale incoming
|
|
|
6ae9ed |
definition and the persistent definition will just be ignored.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1368774
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6ae9ed |
(cherry picked from commit 66278d4bc38aecff6661c91ce9cd3fff26e54a91)
|
|
|
6ae9ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/qemu/qemu_migration.c | 1 +
|
|
|
6ae9ed |
1 file changed, 1 insertion(+)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
6ae9ed |
index ae70f2a..537bfeb 100644
|
|
|
6ae9ed |
--- a/src/qemu/qemu_migration.c
|
|
|
6ae9ed |
+++ b/src/qemu/qemu_migration.c
|
|
|
6ae9ed |
@@ -3876,6 +3876,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
|
|
|
6ae9ed |
if (nbdPort == 0)
|
|
|
6ae9ed |
virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
|
|
|
6ae9ed |
priv->nbdPort = 0;
|
|
|
6ae9ed |
+ virDomainObjRemoveTransientDef(vm);
|
|
|
6ae9ed |
qemuDomainRemoveInactive(driver, vm);
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
virDomainObjEndAPI(&vm;;
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.10.0
|
|
|
6ae9ed |
|