[Spice-devel] [PATCH spice-server 2/2] Remove support for 64 bit pointers on protocol

[Frediano Ziglio]

ping

> 
> Import "codegen: Remove support for --ptrsize" change from spice-common
> and update code accordingly.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/char-device.c     | 2 +-
>  server/dcc-send.c        | 2 +-
>  server/reds.c            | 2 +-
>  server/smartcard.c       | 2 +-
>  subprojects/spice-common | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/server/char-device.c b/server/char-device.c
> index 0ebcc2e05..9ee255664 100644
> --- a/server/char-device.c
> +++ b/server/char-device.c
> @@ -903,7 +903,7 @@ void red_char_device_migrate_data_marshall(RedCharDevice
> *dev,
>      write_to_dev_size = 0;
>      write_to_dev_tokens = 0;
>  
> -    m2 = spice_marshaller_get_ptr_submarshaller(m, 0);
> +    m2 = spice_marshaller_get_ptr_submarshaller(m);
>      if (dev->priv->cur_write_buf) {
>          uint32_t buf_remaining = dev->priv->cur_write_buf->buf +
>          dev->priv->cur_write_buf->buf_used -
>                                   dev->priv->cur_write_buf_pos;
> diff --git a/server/dcc-send.c b/server/dcc-send.c
> index e19ee19c3..326e6fa80 100644
> --- a/server/dcc-send.c
> +++ b/server/dcc-send.c
> @@ -1792,7 +1792,7 @@ static void
> display_channel_marshall_migrate_data_surfaces(DisplayChannelClient
>                                                             SpiceMarshaller
>                                                             *m,
>                                                             int lossy)
>  {
> -    SpiceMarshaller *m2 = spice_marshaller_get_ptr_submarshaller(m, 0);
> +    SpiceMarshaller *m2 = spice_marshaller_get_ptr_submarshaller(m);
>      uint32_t num_surfaces_created;
>      uint8_t *num_surfaces_created_ptr;
>      uint32_t i;
> diff --git a/server/reds.c b/server/reds.c
> index 429f81423..bc0437643 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -1478,7 +1478,7 @@ void reds_marshall_migrate_data(RedsState *reds,
> SpiceMarshaller *m)
>                           sizeof(VDIChunkHeader));
>      spice_marshaller_add_uint8(m, mig_data.agent2client.msg_header_done);
>      spice_marshaller_add_uint32(m,
>      mig_data.agent2client.msg_header_partial_len);
> -    m2 = spice_marshaller_get_ptr_submarshaller(m, 0);
> +    m2 = spice_marshaller_get_ptr_submarshaller(m);
>      spice_marshaller_add(m2, agent_dev->priv->current_read_buf->data,
>                           mig_data.agent2client.msg_header_partial_len);
>      spice_marshaller_add_uint32(m, mig_data.agent2client.msg_remaining);
> diff --git a/server/smartcard.c b/server/smartcard.c
> index ef99056e1..9ccfbc6b1 100644
> --- a/server/smartcard.c
> +++ b/server/smartcard.c
> @@ -409,7 +409,7 @@ static void
> smartcard_channel_send_migrate_data(RedChannelClient *rcc,
>          red_char_device_migrate_data_marshall(RED_CHAR_DEVICE(dev), m);
>          spice_marshaller_add_uint8(m, dev->priv->reader_added);
>          spice_marshaller_add_uint32(m, dev->priv->buf_used);
> -        m2 = spice_marshaller_get_ptr_submarshaller(m, 0);
> +        m2 = spice_marshaller_get_ptr_submarshaller(m);
>          spice_marshaller_add(m2, dev->priv->buf, dev->priv->buf_used);
>          spice_debug("reader added %d partial read size %u",
>          dev->priv->reader_added, dev->priv->buf_used);
>      }
> diff --git a/subprojects/spice-common b/subprojects/spice-common
> index 92d5dfd4b..302e30ff4 160000
> --- a/subprojects/spice-common
> +++ b/subprojects/spice-common
> @@ -1 +1 @@
> -Subproject commit 92d5dfd4bfa7ae4857e96504a6f14c336ed85338
> +Subproject commit 302e30ff43401d9b1e7043a5e5c4f186ca997f66