From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 20 Oct 2011 13:46:55 +0000 (-0500)
Subject: Merge remote-tracking branch 'quintela/migration-pull' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a6e43daa732b90b9ca58e7c38f6faa5a82f4b176;p=qemu.git

Merge remote-tracking branch 'quintela/migration-pull' into staging
---

a6e43daa732b90b9ca58e7c38f6faa5a82f4b176
diff --cc migration.c
index 62b74a6e26,3db12ef11e..bdca72e008
--- a/migration.c
+++ b/migration.c
@@@ -375,17 -299,14 +299,14 @@@ static void migrate_fd_put_ready(void *
          int old_vm_running = runstate_is_running();
  
          DPRINTF("done iterating\n");
 -        vm_stop(RUN_STATE_FINISH_MIGRATE);
 +        vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
  
-         if ((qemu_savevm_state_complete(s->mon, s->file)) < 0) {
-             if (old_vm_running) {
-                 vm_start();
-             }
-             state = MIG_STATE_ERROR;
+         if (qemu_savevm_state_complete(s->mon, s->file) < 0) {
+             migrate_fd_error(s);
          } else {
-             state = MIG_STATE_COMPLETED;
+             migrate_fd_completed(s);
          }
-         if (migrate_fd_cleanup(s) < 0) {
+         if (s->state != MIG_STATE_COMPLETED) {
              if (old_vm_running) {
                  vm_start();
              }
diff --cc savevm.c
index abb4a60643,9e9c7835a0..cf79a56871
--- a/savevm.c
+++ b/savevm.c
@@@ -1619,9 -1671,13 +1667,10 @@@ static int qemu_savevm_state(Monitor *m
      ret = qemu_savevm_state_complete(mon, f);
  
  out:
-     if (qemu_file_has_error(f))
-         ret = -EIO;
+     if (ret == 0) {
+         ret = qemu_file_get_error(f);
+     }
  
 -    if (!ret && saved_vm_running)
 -        vm_start();
 -
      return ret;
  }