diff options
author | Pavel Grunt <pgrunt@redhat.com> | 2016-12-08 17:45:05 +0100 |
---|---|---|
committer | Pavel Grunt <pgrunt@redhat.com> | 2016-12-09 12:36:33 +0100 |
commit | 5e8c6ec814b36d76e217e7f8558dc6eb0ee7ecdf (patch) | |
tree | 93fd07f6f0a04a06eedd30af64a957fa27e3c0b5 | |
parent | e65be108392ba86a42b75dfcf2789fd398ec6b53 (diff) |
Adjust to spice_marshaller_add_ref rename
It was renamed in the spice-common submodule
Submodule update contains following changes:
Francois Gouget (1):
codegen: Fix compatibility with Python 2.6
Frediano Ziglio (9):
Start adding protocol file documentation
Start writing some documentation on protocol
Extended protocol documentation
More work on attribute protocol documentation
Fix BNF notation in documentation
Add protocol documentation for "channel" and "protocol"
Define a new SPICE_VERIFY macro
Detect LZ4_compress_fast_continue function
marshaller: Remove deprecated replacement functions
Jonathon Jongsma (1):
Marshaller: rename _add_ref() to _add_by_ref()
Pavel Grunt (5):
codegen: Do not generate extra null check
silence -Wunused-parameter
spice-deps: Fix accidently deleted comment
spice-deps: Make LZ4 check depending on function
spice-deps: Set python version based on modules availability
Victor Toso (6):
build-sys: requires liblz4 129 or newer
Fix gitignore with new docs folder
canvas-base: use helper to get surface
canvas-base: group ifdef and defined together
canvas-base: remove user data from CanvasBase
sw-canvas: remove unused defines
Acked-by: Victor Toso <victortoso@redhat.com>
m--------- | spice-common | 0 | ||||
-rw-r--r-- | src/channel-base.c | 4 | ||||
-rw-r--r-- | src/channel-usbredir.c | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/spice-common b/spice-common -Subproject 62f3024f4220766761269618bf3df143ff5c995 +Subproject 86dcd22d334a4992718780417bc574623bd6182 diff --git a/src/channel-base.c b/src/channel-base.c index 004dba9..15f25d2 100644 --- a/src/channel-base.c +++ b/src/channel-base.c @@ -262,8 +262,8 @@ void spice_vmc_write_async(SpiceChannel *self, g_task_set_task_data(task, GSIZE_TO_POINTER(count), NULL); msg = spice_msg_out_new(SPICE_CHANNEL(self), SPICE_MSGC_SPICEVMC_DATA); - spice_marshaller_add_ref_full(msg->marshaller, (uint8_t*)buffer, count, - vmc_write_free_cb, task); + spice_marshaller_add_by_ref_full(msg->marshaller, (uint8_t*)buffer, count, + vmc_write_free_cb, task); spice_msg_out_send(msg); } diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c index 4837d68..fef62ce 100644 --- a/src/channel-usbredir.c +++ b/src/channel-usbredir.c @@ -706,11 +706,11 @@ static int try_write_compress_LZ4(SpiceUsbredirChannel *channel, uint8_t *data, SPICE_MSGC_SPICEVMC_COMPRESSED_DATA); msg_out_compressed->marshallers->msg_SpiceMsgCompressedData(msg_out_compressed->marshaller, &compressed_data_msg); - spice_marshaller_add_ref_full(msg_out_compressed->marshaller, - compressed_data_msg.compressed_data, - compressed_data_count, - (spice_marshaller_item_free_func)g_free, - channel); + spice_marshaller_add_by_ref_full(msg_out_compressed->marshaller, + compressed_data_msg.compressed_data, + compressed_data_count, + (spice_marshaller_item_free_func)g_free, + channel); spice_msg_out_send(msg_out_compressed); return TRUE; } @@ -734,8 +734,8 @@ static int usbredir_write_callback(void *user_data, uint8_t *data, int count) #endif msg_out = spice_msg_out_new(SPICE_CHANNEL(channel), SPICE_MSGC_SPICEVMC_DATA); - spice_marshaller_add_ref_full(msg_out->marshaller, data, count, - usbredir_free_write_cb_data, channel); + spice_marshaller_add_by_ref_full(msg_out->marshaller, data, count, + usbredir_free_write_cb_data, channel); spice_msg_out_send(msg_out); return count; |