Re: [Qemu-devel] [PATCH 2/2] migration: Trace event and migration event are different things

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> We can want the trace event even without migration events enabled.
> 
> Reported-by:  Wen Congyang <address@hidden>
> Signed-off-by: Juan Quintela <address@hidden>
> ---
>  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 <address@hidden>

> -- 
> 2.4.3
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK