pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-28 16:29:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove support for 64 bit pointers on protocol

Browse Source 
Import "codegen: Remove support for --ptrsize" change from spice-common
and update code accordingly.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Frediano Ziglio 2019-02-26 09:35:22 +00:00
parent 2ad499ab1f
commit 7f57ff0186
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/char-device.c
View File

@ -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;

2
server/dcc-send.c
View File

@ -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;

2
server/reds.c
View File

@ -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);

2
server/smartcard.c
View File

@ -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);
}

2
subprojects/spice-common

@ -1 +1 @@
Subproject commit 92d5dfd4bfa7ae4857e96504a6f14c336ed85338
Subproject commit 302e30ff43401d9b1e7043a5e5c4f186ca997f66