From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 22 Nov 2018 13:12:14 +0000 (+0100)
Subject: qemuMigrationSrcConfirm: Don't remove domain config if confirm phase fails
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fd54e4fdc82050f97cbf48add3975db7e2ca09be;p=libvirt.git

qemuMigrationSrcConfirm: Don't remove domain config if confirm phase fails

If migration is cancelled or confirm phase fails the domain
should be kept on the source even if VIR_MIGRATE_UNDEFINE_SOURCE
was requested.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 28ec1f4d50..4c3abbb1e6 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3044,7 +3044,7 @@ qemuMigrationSrcConfirm(virQEMUDriverPtr driver,
 
     qemuMigrationJobFinish(driver, vm);
     if (!virDomainObjIsActive(vm)) {
-        if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) {
+        if (!cancelled && ret == 0 && flags & VIR_MIGRATE_UNDEFINE_SOURCE) {
             virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm);
             vm->persistent = 0;
         }