| Message ID | 1434505833-11234-10-git-send-email-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > We now use the helper everywhere, so no need to call this on this two > places. See on previous commit that there were a place where we missed > to mark the trace. Now all tracing is done in migrate_set_state(). Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > migration/migration.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 1c84249..b31c7f4 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -546,7 +546,6 @@ void migrate_fd_error(MigrationState *s) > trace_migrate_fd_error(); > assert(s->file == NULL); > migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); > - trace_migrate_set_state(MIGRATION_STATUS_FAILED); > notifier_list_notify(&migration_state_notifiers, s); > } > > @@ -631,7 +630,6 @@ static MigrationState *migrate_init(const MigrationParams *params) > decompress_thread_count; > s->bandwidth_limit = bandwidth_limit; > 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); > return s; > -- > 2.4.3 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/migration.c b/migration/migration.c index 1c84249..b31c7f4 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -546,7 +546,6 @@ void migrate_fd_error(MigrationState *s) trace_migrate_fd_error(); assert(s->file == NULL); migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); - trace_migrate_set_state(MIGRATION_STATUS_FAILED); notifier_list_notify(&migration_state_notifiers, s); } @@ -631,7 +630,6 @@ static MigrationState *migrate_init(const MigrationParams *params) decompress_thread_count; s->bandwidth_limit = bandwidth_limit; 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); return s;
We now use the helper everywhere, so no need to call this on this two places. See on previous commit that there were a place where we missed to mark the trace. Now all tracing is done in migrate_set_state(). Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/migration.c | 2 -- 1 file changed, 2 deletions(-)