diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-10-29 16:54:42 -0500 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2015-10-30 08:47:50 +0000 |
| commit | 8f5a5582c03774f99796d676f39a32933b6b90a9 (patch) | |
| tree | 4ce9da852140bb1be715652c62f43d5366e6970f | |
| parent | 26005ddb042f7445aec4b6ea795af486dc0b42b8 (diff) | |
| download | spice-8f5a5582c03774f99796d676f39a32933b6b90a9.tar.gz spice-8f5a5582c03774f99796d676f39a32933b6b90a9.tar.xz spice-8f5a5582c03774f99796d676f39a32933b6b90a9.zip | |
Change red_marshall_verb() to accept a VerbItem
Instead of passing a verb enumeration value, pass the verb pipe item
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
| -rw-r--r-- | server/cursor-channel.c | 4 | ||||
| -rw-r--r-- | server/red_worker.c | 4 | ||||
| -rw-r--r-- | server/red_worker.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/server/cursor-channel.c b/server/cursor-channel.c index ee6520f2..6eac5054 100644 --- a/server/cursor-channel.c +++ b/server/cursor-channel.c @@ -309,7 +309,7 @@ static void cursor_channel_send_item(RedChannelClient *rcc, PipeItem *pipe_item) red_cursor_marshall_inval(rcc, m, (CacheItem *)pipe_item); break; case PIPE_ITEM_TYPE_VERB: - red_marshall_verb(rcc, ((VerbItem*)pipe_item)->verb); + red_marshall_verb(rcc, (VerbItem*)pipe_item); break; case PIPE_ITEM_TYPE_CURSOR_INIT: red_reset_cursor_cache(rcc); @@ -317,7 +317,7 @@ static void cursor_channel_send_item(RedChannelClient *rcc, PipeItem *pipe_item) break; case PIPE_ITEM_TYPE_INVAL_CURSOR_CACHE: red_reset_cursor_cache(rcc); - red_marshall_verb(rcc, SPICE_MSG_CURSOR_INVAL_ALL); + red_channel_client_init_send_data(rcc, SPICE_MSG_CURSOR_INVAL_ALL, NULL); break; default: spice_error("invalid pipe item type"); diff --git a/server/red_worker.c b/server/red_worker.c index 9a4869f5..43011c15 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -8394,7 +8394,7 @@ static void display_channel_send_item(RedChannelClient *rcc, PipeItem *pipe_item red_display_marshall_upgrade(rcc, m, (UpgradeItem *)pipe_item); break; case PIPE_ITEM_TYPE_VERB: - red_marshall_verb(rcc, ((VerbItem*)pipe_item)->verb); + red_marshall_verb(rcc, (VerbItem*)pipe_item); break; case PIPE_ITEM_TYPE_MIGRATE_DATA: display_channel_marshall_migrate_data(rcc, m); @@ -8410,7 +8410,7 @@ static void display_channel_send_item(RedChannelClient *rcc, PipeItem *pipe_item break; case PIPE_ITEM_TYPE_INVAL_PALETTE_CACHE: red_reset_palette_cache(dcc); - red_marshall_verb(rcc, SPICE_MSG_DISPLAY_INVAL_ALL_PALETTES); + red_channel_client_init_send_data(rcc, SPICE_MSG_DISPLAY_INVAL_ALL_PALETTES, NULL); break; case PIPE_ITEM_TYPE_CREATE_SURFACE: { SurfaceCreateItem *surface_create = SPICE_CONTAINEROF(pipe_item, SurfaceCreateItem, diff --git a/server/red_worker.h b/server/red_worker.h index 502283e9..c828d999 100644 --- a/server/red_worker.h +++ b/server/red_worker.h @@ -74,10 +74,10 @@ typedef struct VerbItem { uint16_t verb; } VerbItem; -static inline void red_marshall_verb(RedChannelClient *rcc, uint16_t verb) +static inline void red_marshall_verb(RedChannelClient *rcc, VerbItem *item) { spice_assert(rcc); - red_channel_client_init_send_data(rcc, verb, NULL); + red_channel_client_init_send_data(rcc, item->verb, NULL); } static inline void red_pipe_add_verb(RedChannelClient* rcc, uint16_t verb) |