aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2015-07-08 13:58:27 +0200
committerJuan Quintela <quintela@redhat.com>2015-07-15 09:07:54 +0200
commit4ba4bc5e9bfab457a96ac56dc470730a330aded8 (patch)
treef27ab6348ff6f1db41ec0f10c56aa3b86d7a7fbf
parent172c4356f38fbf91675256447a3bedd08220214f (diff)
migration: Trace event and migration event are different things
We can want the trace event even without migration events enabled. Reported-by: Wen Congyang <ghostwcy@gmail.com> Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-rw-r--r--migration/migration.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/migration.c b/migration/migration.c
index ede432eae6..ba82ff6bd1 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -216,7 +216,6 @@ static void migrate_generate_event(int new_state)
{
if (migrate_use_events()) {
qapi_event_send_migration(new_state, &error_abort);
- trace_migrate_set_state(new_state);
}
}
@@ -528,6 +527,7 @@ void qmp_migrate_set_parameters(bool has_compress_level,
static void migrate_set_state(MigrationState *s, int old_state, int new_state)
{
if (atomic_cmpxchg(&s->state, old_state, new_state) == old_state) {
+ trace_migrate_set_state(new_state);
migrate_generate_event(new_state);
}
}