>
> From: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
>
> ---
> server/reds.c | 2 +-
> server/reds.h | 2 +-
> server/sound.c | 2 +-
> server/spicevmc.c | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/server/reds.c b/server/reds.c
> index c5b8c6b..601fe27 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -383,7 +383,7 @@ void reds_register_channel(RedsState *reds, RedChannel
> *channel)
> reds->num_of_channels++;
> }
>
> -void reds_unregister_channel(RedChannel *channel)
> +void reds_unregister_channel(RedsState *reds, RedChannel *channel)
> {
> if (ring_item_is_linked(&channel->link)) {
> ring_remove(&channel->link);
> diff --git a/server/reds.h b/server/reds.h
> index 8850bc0..d27b592 100644
> --- a/server/reds.h
> +++ b/server/reds.h
> @@ -56,7 +56,7 @@ uint32_t reds_get_mm_time(void);
> void reds_set_client_mouse_allowed(int is_client_mouse_allowed,
> int x_res, int y_res);
> void reds_register_channel(RedsState *reds, RedChannel *channel);
> -void reds_unregister_channel(RedChannel *channel);
> +void reds_unregister_channel(RedsState *reds, RedChannel *channel);
> int reds_get_mouse_mode(void); // used by inputs_channel
> int reds_get_agent_mouse(void); // used by inputs_channel
> int reds_has_vdagent(void); // used by inputs channel
> diff --git a/server/sound.c b/server/sound.c
> index 388bc5e..17968e0 100644
> --- a/server/sound.c
> +++ b/server/sound.c
> @@ -1571,7 +1571,7 @@ static void snd_detach_common(SndWorker *worker)
> }
> remove_worker(worker);
> snd_disconnect_channel(worker->connection);
> - reds_unregister_channel(worker->base_channel);
> + reds_unregister_channel(reds, worker->base_channel);
> red_channel_destroy(worker->base_channel);
> }
>
> diff --git a/server/spicevmc.c b/server/spicevmc.c
> index 9916278..28a65d7 100644
> --- a/server/spicevmc.c
> +++ b/server/spicevmc.c
> @@ -566,7 +566,7 @@ void spicevmc_device_disconnect(SpiceCharDeviceInstance
> *sin)
> state->chardev_st = NULL;
> sin->st = NULL;
>
> - reds_unregister_channel(&state->channel);
> + reds_unregister_channel(reds, &state->channel);
> free(state->pipe_item);
> red_channel_destroy(&state->channel);
> }
Acked-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel