Re: [PATCH v2 5/7] migration: Dump type of channel in set_incoming_channel tracepoint

[Fabiano Rosas <farosas@suse.de>]

Peter Xu <peterx@redhat.com> writes:

> Add this info to be crystal clear on what channel we're installing.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  migration/channel.h    |  3 ++-
>  migration/channel.c    | 10 +++++++++-
>  migration/trace-events |  2 +-
>  3 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/migration/channel.h b/migration/channel.h
> index a7d0d29058..678712f291 100644
> --- a/migration/channel.h
> +++ b/migration/channel.h
> @@ -24,7 +24,8 @@ typedef enum {
>      CH_NONE,
>      CH_MAIN,
>      CH_MULTIFD,
> -    CH_POSTCOPY
> +    CH_POSTCOPY,
> +    CH_NUM,
>  } MigChannelType;
>  
>  void migration_channel_process_incoming(QIOChannel *ioc);
> diff --git a/migration/channel.c b/migration/channel.c
> index 8407ea46cb..b9065efd03 100644
> --- a/migration/channel.c
> +++ b/migration/channel.c
> @@ -34,6 +34,13 @@
>  #include "trace.h"
>  #include "yank_functions.h"
>  
> +static const char *const mig_channel_str[CH_NUM] = {
> +    [CH_NONE] = "NONE",
> +    [CH_MAIN] = "MAIN",
> +    [CH_MULTIFD] = "MULTIFD",
> +    [CH_POSTCOPY] = "PREEMPT",
> +};
> +
>  void migration_connect_outgoing(MigrationState *s, MigrationAddress *addr,
>                                  Error **errp)
>  {
> @@ -219,7 +226,8 @@ static bool migration_incoming_channel_install(MigrationIncomingState *mis,
>      }
>  
>      trace_migration_set_incoming_channel(ioc,
> -                                         object_get_typename(OBJECT(ioc)));
> +                                         object_get_typename(OBJECT(ioc)),
> +                                         mig_channel_str[ch]);
>      migration_ioc_register_yank(ioc);
>  
>      if (migration_incoming_setup(ioc, ch, errp)) {
> diff --git a/migration/trace-events b/migration/trace-events
> index c93c9f9e75..8840d82f8d 100644
> --- a/migration/trace-events
> +++ b/migration/trace-events
> @@ -208,7 +208,7 @@ migration_transferred_bytes(uint64_t qemu_file, uint64_t multifd, uint64_t rdma)
>  
>  # channel.c
>  migration_channel_process_incoming(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> -migration_set_incoming_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
> +migration_set_incoming_channel(void *ioc, const char *ioctype, const char *type) "ioc=%p ioctype=%s type=%s"
>  migration_set_outgoing_channel(void *ioc, const char *ioctype) "ioc=%p ioctype=%s"
>  
>  # global_state.c

Reviewed-by: Fabiano Rosas <farosas@suse.de>