[Spice-devel] [PATCH 07/14] server: remove worker->id

[Frediano Ziglio]

> 
> From: Marc-André Lureau <marcandre.lureau at gmail.com>
> 
> ---
>  server/red_worker.c | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/server/red_worker.c b/server/red_worker.c
> index 9741758..d14a481 100644
> --- a/server/red_worker.c
> +++ b/server/red_worker.c
> @@ -595,7 +595,6 @@ typedef struct RedWorker {
>      RedDispatcher *red_dispatcher;
>  
>      int channel;
> -    int id;
>      int running;
>      struct pollfd poll_fds[MAX_EVENT_SOURCES];
>      struct SpiceWatch watches[MAX_EVENT_SOURCES];
> @@ -9543,7 +9542,7 @@ CommonChannelClient
> *common_channel_new_client(CommonChannel *common,
>      }
>      CommonChannelClient *common_cc = (CommonChannelClient*)rcc;
>      common_cc->worker = common->worker;
> -    common_cc->id = common->worker->id;
> +    common_cc->id = common->worker->qxl->id;
>      common->during_target_migrate = mig_target;
>  
>      // TODO: move wide/narrow ack setting to red_channel.
> @@ -9595,7 +9594,7 @@ RedChannel *red_worker_new_channel(RedWorker *worker,
> int size,
>      channel_cbs->release_recv_buf = common_release_recv_buf;
>  
>      channel = red_channel_create_parser(size, &worker_core,
> -                                        channel_type, worker->id,
> +                                        channel_type, worker->qxl->id,
>                                          TRUE /* handle_acks */,
>                                          spice_get_client_channel_parser(channel_type,
>                                          NULL),
>                                          handle_parsed,
> @@ -11054,7 +11053,6 @@ RedWorker* red_worker_new(QXLInstance *qxl,
> RedDispatcher *red_dispatcher)
>  
>      worker->red_dispatcher = red_dispatcher;
>      worker->qxl = qxl;
> -    worker->id = qxl->id;
>      worker->channel = dispatcher_get_recv_fd(dispatcher);
>      register_callbacks(dispatcher);
>      if (worker->record_fd) {
> @@ -11079,7 +11077,7 @@ RedWorker* red_worker_new(QXLInstance *qxl,
> RedDispatcher *red_dispatcher)
>      stat_init(&worker->__exclude_stat, __exclude_stat_name);
>  #ifdef RED_STATISTICS
>      char worker_str[20];
> -    sprintf(worker_str, "display[%d]", worker->id);
> +    sprintf(worker_str, "display[%d]", worker->qxl->id);
>      worker->stat = stat_add_node(INVALID_STAT_REF, worker_str, TRUE);
>      worker->wakeup_counter = stat_add_counter(worker->stat, "wakeups",
>      TRUE);
>      worker->command_counter = stat_add_counter(worker->stat, "commands",
>      TRUE);

Ack

Frediano