[Spice-devel] [PATCH 01/11] Rename some missing names related to RedCharDevice

[Pavel Grunt]

Acked-by: Pavel Grunt <pgrunt at redhat.com>

On Fri, 2016-04-01 at 13:37 +0100, Frediano Ziglio wrote:
> ---
>  server/char-device.c | 6 +++---
>  server/char-device.h | 2 +-
>  server/reds.c        | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/server/char-device.c b/server/char-device.c
> index 2957a1b..22f2de2 100644
> --- a/server/char-device.c
> +++ b/server/char-device.c
> @@ -92,7 +92,7 @@ static void red_char_device_ref(RedCharDevice
> *char_dev);
>  static void red_char_device_unref(RedCharDevice *char_dev);
>  static void
> red_char_device_write_buffer_unref(RedCharDeviceWriteBuffer
> *write_buf);
>  
> -static void spice_char_dev_write_retry(void *opaque);
> +static void red_char_device_write_retry(void *opaque);
>  
>  typedef struct RedCharDeviceMsgToClientItem {
>      RingItem link;
> @@ -566,7 +566,7 @@ static int
> red_char_device_write_to_device(RedCharDevice *dev)
>      return total;
>  }
>  
> -static void spice_char_dev_write_retry(void *opaque)
> +static void red_char_device_write_retry(void *opaque)
>  {
>      RedCharDevice *dev = opaque;
>  
> @@ -750,7 +750,7 @@ RedCharDevice
> *red_char_device_create(SpiceCharDeviceInstance *sin,
>      sif = spice_char_device_get_interface(char_dev->priv->sin);
>      if (sif->base.minor_version <= 2 ||
>          !(sif->flags & SPICE_CHAR_DEVICE_NOTIFY_WRITABLE)) {
> -        char_dev->priv->write_to_dev_timer =
> reds_core_timer_add(reds, spice_char_dev_write_retry, char_dev);
> +        char_dev->priv->write_to_dev_timer =
> reds_core_timer_add(reds, red_char_device_write_retry, char_dev);
>          if (!char_dev->priv->write_to_dev_timer) {
>              spice_error("failed creating char dev write timer");
>          }
> diff --git a/server/char-device.h b/server/char-device.h
> index f3ae6cb..b0efa1f 100644
> --- a/server/char-device.h
> +++ b/server/char-device.h
> @@ -158,7 +158,7 @@ int red_char_device_restore(RedCharDevice *dev,
>   * protocol:
>   *  The client tokens' are set only once, when the main channel is
> initialized.
>   *  Instead, it would have been more appropriate to reset them upon
> AGEN_CONNECT.
> - *  The client tokens are tracked as part of the
> SpiceCharDeviceClientState. Thus,
> + *  The client tokens are tracked as part of the
> RedCharDeviceClient. Thus,
>   *  in order to be backwartd compatible with the client, we need to
> track the tokens
>   *  event when the agent is detached. We don't destroy the
> char_device state, and
>   *  instead we just reset it.
> diff --git a/server/reds.c b/server/reds.c
> index 12de608..d913539 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -425,7 +425,7 @@ static void reds_reset_vdp(RedsState *reds)
>       * tokens management in the vdagent protocol:
>       *  The client tokens' are set only once, when the main channel
> is initialized.
>       *  Instead, it would have been more appropriate to reset them
> upon AGEN_CONNECT.
> -     *  The client tokens are tracked as part of the
> SpiceCharDeviceClientState. Thus,
> +     *  The client tokens are tracked as part of the
> RedCharDeviceClient. Thus,
>       *  in order to be backward compatible with the client, we need
> to track the tokens
>       *  even if the agent is detached. We don't destroy the
> char_device state, and
>       *  instead we just reset it.