[Qemu-devel] [6997] propagate error on failed completion (Glauber Costa)

[Qemu-devel] [6997] propagate error on failed completion (Glauber Costa)

[Anthony Liguori]

Revision: 6997
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6997
Author:   aliguori
Date:     2009-04-05 19:30:33 +0000 (Sun, 05 Apr 2009)
Log Message:
-----------
propagate error on failed completion (Glauber Costa)

migrate_fd_put_ready() calls qemu_savevm_state_complete(),
but the later can fail.

If it happens, re-start the vm and propagate the error up

Based on a patch by Yaniv Kamay

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/migration.c

Modified: trunk/migration.c
===================================================================
--- trunk/migration.c	2009-04-05 19:29:26 UTC (rev 6996)
+++ trunk/migration.c	2009-04-05 19:30:33 UTC (rev 6997)
@@ -220,13 +220,19 @@
 
     dprintf("iterate\n");
     if (qemu_savevm_state_iterate(s->file) == 1) {
+        int state;
         dprintf("done iterating\n");
         vm_stop(0);
 
         bdrv_flush_all();
-        qemu_savevm_state_complete(s->file);
-        s->state = MIG_STATE_COMPLETED;
+        if ((qemu_savevm_state_complete(s->file)) < 0) {
+            vm_start();
+            state = MIG_STATE_ERROR;
+        } else {
+            state = MIG_STATE_COMPLETED;
+        }
         migrate_fd_cleanup(s);
+        s->state = state;
     }
 }