diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-22 17:36:09 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2013-03-11 13:32:00 +0100 |
| commit | 7a2c17216cd5ae4c22844123b8e9360d517932f8 (patch) | |
| tree | 0706bacc37853ff1f0547a839bade57c6282d7fc /migration.c | |
| parent | 891518abd804401978e402d588733e282be960ad (diff) | |
| download | qemu-7a2c17216cd5ae4c22844123b8e9360d517932f8.tar.gz | |
migration: move more error handling to migrate_fd_cleanup
The next patch will add more cases where qemu_savevm_state_cancel
needs to be called; prepare for that already, the function can be
called twice with no ill effect.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'migration.c')
| -rw-r--r-- | migration.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/migration.c b/migration.c index 65e8583517..10ce9fe6a2 100644 --- a/migration.c +++ b/migration.c @@ -260,7 +260,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, /* shared migration helpers */ -static int migrate_fd_cleanup(MigrationState *s) +static void migrate_fd_cleanup(MigrationState *s) { int ret = 0; @@ -271,7 +271,13 @@ static int migrate_fd_cleanup(MigrationState *s) } assert(s->fd == -1); - return ret; + if (ret < 0 && s->state == MIG_STATE_ACTIVE) { + s->state = MIG_STATE_ERROR; + } + + if (s->state != MIG_STATE_ACTIVE) { + qemu_savevm_state_cancel(); + } } void migrate_fd_error(MigrationState *s) @@ -285,9 +291,8 @@ void migrate_fd_error(MigrationState *s) static void migrate_fd_completed(MigrationState *s) { DPRINTF("setting completed state\n"); - if (migrate_fd_cleanup(s) < 0) { - s->state = MIG_STATE_ERROR; - } else { + migrate_fd_cleanup(s); + if (s->state == MIG_STATE_ACTIVE) { s->state = MIG_STATE_COMPLETED; runstate_set(RUN_STATE_POSTMIGRATE); } @@ -322,7 +327,6 @@ static void migrate_fd_cancel(MigrationState *s) s->state = MIG_STATE_CANCELLED; notifier_list_notify(&migration_state_notifiers, s); - qemu_savevm_state_cancel(); migrate_fd_cleanup(s); } |