]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuMigrationSrcConfirm: Don't remove domain config if confirm phase fails
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 22 Nov 2018 13:12:14 +0000 (14:12 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 23 Nov 2018 15:25:54 +0000 (16:25 +0100)
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>
src/qemu/qemu_migration.c

index 28ec1f4d509decb1b886db8deecf980bf8e9b8fe..4c3abbb1e6ed7ffd82fa9611c5b3825f739c64ee 100644 (file)
@@ -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;
         }