diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-10-29 16:54:45 -0500 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2015-10-30 08:47:56 +0000 |
| commit | 30c9ff7a8fcbf3e6cb9a7c1f8030c5e8b40f2f0b (patch) | |
| tree | a36c8d50bdef2c2abb7b2e9b427fe714a822a22d | |
| parent | 591f39e7ccd1f9b5ba1839c937883970e1bfefdb (diff) | |
| download | spice-30c9ff7a8fcbf3e6cb9a7c1f8030c5e8b40f2f0b.tar.gz spice-30c9ff7a8fcbf3e6cb9a7c1f8030c5e8b40f2f0b.tar.xz spice-30c9ff7a8fcbf3e6cb9a7c1f8030c5e8b40f2f0b.zip | |
CursorChannel* arg in cursor_channel_client_new()
Instead of passing a CommonChannel* argument, use CursorChannel* since
this function is only valid for CursorChannels.
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
| -rw-r--r-- | server/cursor-channel.c | 5 | ||||
| -rw-r--r-- | server/cursor-channel.h | 2 | ||||
| -rw-r--r-- | server/red_worker.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/server/cursor-channel.c b/server/cursor-channel.c index 22514dc5..b47eeaa6 100644 --- a/server/cursor-channel.c +++ b/server/cursor-channel.c @@ -381,14 +381,13 @@ CursorChannel* cursor_channel_new(RedWorker *worker) return cursor; } -CursorChannelClient *cursor_channel_client_new(CommonChannel *common, - RedClient *client, RedsStream *stream, +CursorChannelClient* cursor_channel_client_new(CursorChannel *cursor, RedClient *client, RedsStream *stream, int mig_target, uint32_t *common_caps, int num_common_caps, uint32_t *caps, int num_caps) { CursorChannelClient *ccc = - (CursorChannelClient*)common_channel_new_client(common, + (CursorChannelClient*)common_channel_new_client(&cursor->common, sizeof(CursorChannelClient), client, stream, mig_target, diff --git a/server/cursor-channel.h b/server/cursor-channel.h index 6a26bdb7..19142269 100644 --- a/server/cursor-channel.h +++ b/server/cursor-channel.h @@ -87,7 +87,7 @@ CursorItem* cursor_item_new (RedCursorCmd *cmd, uint32_t gro void cursor_item_unref (QXLInstance *qxl, CursorItem *cursor); -CursorChannelClient *cursor_channel_client_new(CommonChannel *common, +CursorChannelClient* cursor_channel_client_new(CursorChannel *cursor, RedClient *client, RedsStream *stream, int mig_target, uint32_t *common_caps, int num_common_caps, diff --git a/server/red_worker.c b/server/red_worker.c index a46100f3..d0ef9264 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -9931,7 +9931,7 @@ static void red_connect_cursor(RedWorker *worker, RedClient *client, RedsStream } channel = worker->cursor_channel; spice_info("add cursor channel client"); - ccc = cursor_channel_client_new(&channel->common, client, stream, + ccc = cursor_channel_client_new(channel, client, stream, migrate, common_caps, num_common_caps, caps, num_caps); |