diff options
| author | Peter Xu <peterx@redhat.com> | 2017-08-30 16:32:01 +0800 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-09-06 16:36:38 +0100 |
| commit | a31fedeed764ce0b0d6097d4334c5770e74641a0 (patch) | |
| tree | 0115982cf1cb8051ee989bb4d50ae89aaec0e8f2 /migration | |
| parent | 04583a9e8fbeb2c5c0607327b853b306aef7465f (diff) | |
migration: dump str in migrate_set_state trace
Strings are more readable for debugging.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1504081950-2528-5-git-send-email-peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Fixed up merge with 977c73
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 3 | ||||
| -rw-r--r-- | migration/trace-events | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/migration/migration.c b/migration/migration.c index 9838ccc885..959e8ec88e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -913,8 +913,9 @@ void qmp_migrate_start_postcopy(Error **errp) void migrate_set_state(int *state, int old_state, int new_state) { + assert(new_state < MIGRATION_STATUS__MAX); if (atomic_cmpxchg(state, old_state, new_state) == old_state) { - trace_migrate_set_state(new_state); + trace_migrate_set_state(MigrationStatus_str(new_state)); migrate_generate_event(new_state); } } diff --git a/migration/trace-events b/migration/trace-events index 7a3b5144ff..d2910a6e7b 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -80,7 +80,7 @@ ram_save_queue_pages(const char *rbname, size_t start, size_t len) "%s: start: 0 # migration/migration.c await_return_path_close_on_source_close(void) "" await_return_path_close_on_source_joining(void) "" -migrate_set_state(int new_state) "new state %d" +migrate_set_state(const char *new_state) "new state %s" migrate_fd_cleanup(void) "" migrate_fd_error(const char *error_desc) "error=%s" migrate_fd_cancel(void) "" |