qemu: migrate: Save MigratePerform error in MigrateFinish.

This way we won't squash the original error report in
MigratePerform, as is done for P2P and Tunneled migration.

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 881756568885085997a031ec85ab2520955bd5f0..02f612fffaa6c07b7fbaf04facd3025ca616210b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7676,8 +7676,12 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
     virDomainObjPtr vm;
     virDomainPtr dom = NULL;
     virDomainEventPtr event = NULL;
+    virErrorPtr orig_err;
     int newVM = 1;
 
+    /* Migration failed. Save the current error so nothing squashes it */
+    orig_err = virSaveLastError();
+
     qemuDriverLock(driver);
     vm = virDomainFindByName(&driver->domains, dname);
     if (!vm) {
@@ -7771,6 +7775,10 @@ endjob:
         vm = NULL;
 
 cleanup:
+    if (orig_err) {
+        virSetError(orig_err);
+        virFreeError(orig_err);
+    }
     if (vm)
         virDomainObjUnlock(vm);
     if (event)