diff mbox

[2/2] migration: Trace event and migration event are different things

Message ID 1436357310-3879-3-git-send-email-quintela@redhat.com
State New
Headers show

Commit Message

Juan Quintela July 8, 2015, 12:08 p.m. UTC 
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>
---
 migration/migration.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dr. David Alan Gilbert July 8, 2015, 12:20 p.m. UTC | #1 
* Juan Quintela (quintela@redhat.com) wrote:
> 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>
> ---
>  migration/migration.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index ede432e..ba82ff6 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);
>      }
>  }

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> -- 
> 2.4.3
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff mbox

Patch

diff --git a/migration/migration.c b/migration/migration.c
index ede432e..ba82ff6 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);
     }
 }