[Spice-devel] [PATCH spice-server 3/4] cursor-channel: Remove dependency from QXL

[Jonathon Jongsma]

Acked-by: Jonathon Jongsma <jjongsma at redhat.com>


On Wed, 2017-09-06 at 18:15 +0100, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/cursor-channel.c | 5 ++---
>  server/cursor-channel.h | 4 ++--
>  server/red-worker.c     | 2 +-
>  3 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/server/cursor-channel.c b/server/cursor-channel.c
> index fad90ad00..a844100a0 100644
> --- a/server/cursor-channel.c
> +++ b/server/cursor-channel.c
> @@ -232,7 +232,7 @@ static void
> cursor_channel_send_item(RedChannelClient *rcc, RedPipeItem *pipe_it
>      red_channel_client_begin_send_message(rcc);
>  }
>  
> -CursorChannel* cursor_channel_new(RedsState *server, QXLInstance
> *qxl,
> +CursorChannel* cursor_channel_new(RedsState *server, int id,
>                                    const SpiceCoreInterfaceInternal
> *core)
>  {
>      spice_debug("create cursor channel");
> @@ -240,9 +240,8 @@ CursorChannel* cursor_channel_new(RedsState
> *server, QXLInstance *qxl,
>                          "spice-server", server,
>                          "core-interface", core,
>                          "channel-type", SPICE_CHANNEL_CURSOR,
> -                        "id", qxl->id,
> +                        "id", id,
>                          "migration-flags", 0,
> -                        "qxl", qxl,
>                          "handle-acks", TRUE,
>                          NULL);
>  }
> diff --git a/server/cursor-channel.h b/server/cursor-channel.h
> index f279aafcf..50cf71f16 100644
> --- a/server/cursor-channel.h
> +++ b/server/cursor-channel.h
> @@ -56,8 +56,8 @@ GType cursor_channel_get_type(void) G_GNUC_CONST;
>   * provided as helper functions and should only be called from the
>   * CursorChannel thread.
>   */
> -CursorChannel*       cursor_channel_new         (RedsState *server,
> QXLInstance *qxl,
> -                                                 const
> SpiceCoreInterfaceInternal *core);
> +CursorChannel* cursor_channel_new(RedsState *server, int id,
> +                                  const SpiceCoreInterfaceInternal
> *core);
>  
>  void                 cursor_channel_reset       (CursorChannel
> *cursor);
>  void                 cursor_channel_do_init     (CursorChannel
> *cursor);
> diff --git a/server/red-worker.c b/server/red-worker.c
> index 5756bfd8c..b18e05461 100644
> --- a/server/red-worker.c
> +++ b/server/red-worker.c
> @@ -1343,7 +1343,7 @@ RedWorker* red_worker_new(QXLInstance *qxl,
>  
>      worker->event_timeout = INF_EVENT_WAIT;
>  
> -    worker->cursor_channel = cursor_channel_new(reds, qxl,
> +    worker->cursor_channel = cursor_channel_new(reds, qxl->id,
>                                                  &worker->core);
>      channel = RED_CHANNEL(worker->cursor_channel);
>      red_channel_init_stat_node(channel, &worker->stat,
> "cursor_channel");