From a9d12c2444e43a0d3e5135eb15b4b62a7c011427 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 8 Jan 2010 20:55:14 -0500
Subject: [PATCH] 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.
---
 src/qemu/qemu_driver.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8817565688..02f612fffa 100644
--- 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)