From c0b2ba46c5ceb806a1639bb86b0b457309674b23 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 13 Sep 2011 15:11:38 +0200 Subject: [PATCH] migration: simplify state assignmente Once there, make sure that if we already know that there is one error, just call migration_fd_cleanup() with the ERROR state. Signed-off-by: Juan Quintela Reviewed-by: Anthony Liguori --- migration.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/migration.c b/migration.c index 77a51adc5b..7fd6c23fa5 100644 --- a/migration.c +++ b/migration.c @@ -371,7 +371,6 @@ void migrate_fd_put_ready(void *opaque) DPRINTF("iterate\n"); if (qemu_savevm_state_iterate(s->mon, s->file) == 1) { - int state; int old_vm_running = runstate_is_running(); DPRINTF("done iterating\n"); @@ -381,20 +380,18 @@ void migrate_fd_put_ready(void *opaque) if (old_vm_running) { vm_start(); } - state = MIG_STATE_ERROR; - } else { - state = MIG_STATE_COMPLETED; + s->state = MIG_STATE_ERROR; } if (migrate_fd_cleanup(s) < 0) { if (old_vm_running) { vm_start(); } - state = MIG_STATE_ERROR; + s->state = MIG_STATE_ERROR; } - if (state == MIG_STATE_COMPLETED) { + if (s->state == MIG_STATE_ACTIVE) { + s->state = MIG_STATE_COMPLETED; runstate_set(RUN_STATE_POSTMIGRATE); } - s->state = state; notifier_list_notify(&migration_state_notifiers, NULL); } }