[Spice-devel] [PATCH 12/22] worker: change red_worker_new_channel result to CommonChannel*

[Fabiano Fidêncio]

On Wed, Dec 2, 2015 at 5:19 PM, Frediano Ziglio <fziglio at redhat.com> wrote:
> Signed-off-by: Marc-André Lureau <marcandre.lureau at gmail.com>
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/cursor-channel.c | 2 +-
>  server/red_worker.c     | 4 ++--
>  server/red_worker.h     | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/server/cursor-channel.c b/server/cursor-channel.c
> index 9d72299..840ff30 100644
> --- a/server/cursor-channel.c
> +++ b/server/cursor-channel.c
> @@ -427,7 +427,7 @@ static void cursor_channel_release_item(RedChannelClient *rcc, PipeItem *item, i
>  CursorChannel* cursor_channel_new(RedWorker *worker)
>  {
>      CursorChannel *cursor_channel;
> -    RedChannel *channel = NULL;
> +    CommonChannel *channel = NULL;
>      ChannelCbs cbs = {
>          .on_disconnect =  cursor_channel_client_on_disconnect,
>          .send_item = cursor_channel_send_item,
> diff --git a/server/red_worker.c b/server/red_worker.c
> index 7ae13f0..cc2e2ab 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -622,7 +622,7 @@ CommonChannelClient *common_channel_new_client(CommonChannel *common,
>  }
>
>
> -RedChannel *red_worker_new_channel(RedWorker *worker, int size,
> +CommonChannel *red_worker_new_channel(RedWorker *worker, int size,
>                                     const char *name,
>                                     uint32_t channel_type, int migration_flags,
>                                     ChannelCbs *channel_cbs,
> @@ -653,7 +653,7 @@ RedChannel *red_worker_new_channel(RedWorker *worker, int size,
>
>      common = (CommonChannel *)channel;
>      common->worker = worker;
> -    return channel;
> +    return common;
>  }
>
>  static void guest_set_client_capabilities(RedWorker *worker)
> diff --git a/server/red_worker.h b/server/red_worker.h
> index 1e2c550..57e3c0f 100644
> --- a/server/red_worker.h
> +++ b/server/red_worker.h
> @@ -103,7 +103,7 @@ RedMemSlotInfo* red_worker_get_memslot(RedWorker *worker);
>  void red_drawable_unref(RedWorker *worker, RedDrawable *red_drawable,
>                          uint32_t group_id);
>
> -RedChannel *red_worker_new_channel(RedWorker *worker, int size,
> +CommonChannel *red_worker_new_channel(RedWorker *worker, int size,
>                                     const char *name,
>                                     uint32_t channel_type, int migration_flags,
>                                     ChannelCbs *channel_cbs,
> --
> 2.4.3
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel

Acked-by: Fabiano Fidêncio <fidencio at redhat.com>