From 67afff79111f0ce1ae20010c27a30b5ec61f362c Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 22 Feb 2011 23:18:20 +0100 Subject: [PATCH] migration: Refactor and simplify error checking in migrate_fd_put_ready Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori --- migration.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/migration.c b/migration.c index 281fbaefd7..ee4ef4ba6f 100644 --- a/migration.c +++ b/migration.c @@ -372,23 +372,22 @@ static void migrate_fd_put_ready(void *opaque) DPRINTF("done iterating\n"); vm_stop(RUN_STATE_FINISH_MIGRATE); - if ((qemu_savevm_state_complete(s->mon, s->file)) < 0) { + if (qemu_savevm_state_complete(s->mon, s->file) < 0) { + migrate_fd_error(s); + } else { + if (migrate_fd_cleanup(s) < 0) { + migrate_fd_error(s); + } else { + s->state = MIG_STATE_COMPLETED; + runstate_set(RUN_STATE_POSTMIGRATE); + notifier_list_notify(&migration_state_notifiers, NULL); + } + } + if (s->get_status(s) != MIG_STATE_COMPLETED) { if (old_vm_running) { vm_start(); } - s->state = MIG_STATE_ERROR; } - if (migrate_fd_cleanup(s) < 0) { - if (old_vm_running) { - vm_start(); - } - s->state = MIG_STATE_ERROR; - } - if (s->state == MIG_STATE_ACTIVE) { - s->state = MIG_STATE_COMPLETED; - runstate_set(RUN_STATE_POSTMIGRATE); - } - notifier_list_notify(&migration_state_notifiers, NULL); } }