mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Use always helper to set state

Browse Source 
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>
This commit is contained in:
Juan Quintela 2015-06-17 01:36:40 +02:00
parent 656a233440
commit 7844337d1e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/migration.c
View File

@ -549,7 +549,7 @@ void migrate_fd_error(MigrationState *s)
{ {
trace_migrate_fd_error(); trace_migrate_fd_error();
assert(s->file == NULL); 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); trace_migrate_set_state(MIGRATION_STATUS_FAILED);
notifier_list_notify(&migration_state_notifiers, s); notifier_list_notify(&migration_state_notifiers, s);
} }
@ -634,7 +634,7 @@ static MigrationState *migrate_init(const MigrationParams *params)
s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] = s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
decompress_thread_count; decompress_thread_count;
s->bandwidth_limit = bandwidth_limit; 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); trace_migrate_set_state(MIGRATION_STATUS_SETUP);
s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); 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 { } else {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri", error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
"a valid migration protocol"); "a valid migration protocol");
s->state = MIGRATION_STATUS_FAILED; migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
return; return;
} }