diff options
| author | Juan Quintela <quintela@redhat.com> | 2015-06-17 01:36:40 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2015-07-07 14:54:54 +0200 |
| commit | 7844337d1efb2c47dc3f306d7621e1cafca8ba67 (patch) | |
| tree | e1af4f08dcb1e9b6b9321fec1d4a64705bb95dca /migration/migration.c | |
| parent | 656a233440e552230f9d1da016b94a81b86658dc (diff) | |
| download | qemu-7844337d1efb2c47dc3f306d7621e1cafca8ba67.zip | |
migration: Use always helper to set state
There were three places that were not using the migrate_set_state()
helper, just fix that.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/migration/migration.c b/migration/migration.c index 5c1233fb01..78eb71535e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -549,7 +549,7 @@ void migrate_fd_error(MigrationState *s) { trace_migrate_fd_error(); assert(s->file == NULL); - s->state = MIGRATION_STATUS_FAILED; + migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); trace_migrate_set_state(MIGRATION_STATUS_FAILED); notifier_list_notify(&migration_state_notifiers, s); } @@ -634,7 +634,7 @@ static MigrationState *migrate_init(const MigrationParams *params) s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] = decompress_thread_count; s->bandwidth_limit = bandwidth_limit; - s->state = MIGRATION_STATUS_SETUP; + migrate_set_state(s, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP); trace_migrate_set_state(MIGRATION_STATUS_SETUP); s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); @@ -733,7 +733,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, } else { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri", "a valid migration protocol"); - s->state = MIGRATION_STATUS_FAILED; + migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); return; } |