]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: Don't fail migration on save status failure
authorJiri Denemark <jdenemar@redhat.com>
Tue, 7 Jul 2015 12:15:31 +0000 (14:15 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 18 Sep 2015 11:50:02 +0000 (13:50 +0200)
When we save status XML at the point during migration where we have
already started the domain on destination, we can't really go back and
abort migration. Thus the only thing we can do is to log a warning and
report success.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
src/qemu/qemu_migration.c

index 48a447612fbc6c3f7039302662f5f5dd16c24b82..3ecc1e5ba796a30f425e0ee976fd88949585f019 100644 (file)
@@ -3816,10 +3816,8 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver,
                                                       VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
         }
 
-        if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) {
+        if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
             VIR_WARN("Failed to save status on vm %s", vm->def->name);
-            goto cleanup;
-        }
     }
 
  done:
@@ -5780,10 +5778,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
         }
 
         if (virDomainObjIsActive(vm) &&
-            virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) {
+            virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
             VIR_WARN("Failed to save status on vm %s", vm->def->name);
-            goto endjob;
-        }
 
         /* Guest is successfully running, so cancel previous auto destroy */
         qemuProcessAutoDestroyRemove(driver, vm);