Remove not necessary inval_type from RedCacheItem

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-05-24 15:30:28 +01:00
parent 7a51188891
commit 68d5ca29f8
4 changed files with 2 additions and 7 deletions

View File

@ -34,7 +34,6 @@ struct RedCacheItem {
} u;
uint64_t id;
size_t size;
uint32_t inval_type;
};
#endif /* CACHE_ITEM_H_ */

View File

@ -24,7 +24,6 @@
#define CACHE_NAME cursor_cache
#define CACHE_HASH_KEY CURSOR_CACHE_HASH_KEY
#define CACHE_HASH_SIZE CURSOR_CACHE_HASH_SIZE
#define CACHE_INVAL_TYPE SPICE_MSG_CURSOR_INVAL_ONE
#define FUNC_NAME(name) red_cursor_cache_##name
#define VAR_NAME(name) cursor_cache_##name
#define CHANNEL CursorChannel
@ -35,7 +34,6 @@
#define CACHE_NAME palette_cache
#define CACHE_HASH_KEY PALETTE_CACHE_HASH_KEY
#define CACHE_HASH_SIZE PALETTE_CACHE_HASH_SIZE
#define CACHE_INVAL_TYPE SPICE_MSG_DISPLAY_INVAL_PALETTE
#define FUNC_NAME(name) red_palette_cache_##name
#define VAR_NAME(name) palette_cache_##name
#define CHANNEL DisplayChannel
@ -110,7 +108,6 @@ static int FUNC_NAME(add)(CHANNELCLIENT *channel_client, uint64_t id, size_t siz
ring_add(&channel_client->VAR_NAME(lru), &item->u.cache_data.lru_link);
item->id = id;
item->size = size;
item->inval_type = CACHE_INVAL_TYPE;
return TRUE;
}
@ -134,7 +131,6 @@ static void FUNC_NAME(reset)(CHANNELCLIENT *channel_client, long size)
#undef CACHE_NAME
#undef CACHE_HASH_KEY
#undef CACHE_HASH_SIZE
#undef CACHE_INVAL_TYPE
#undef CACHE_MAX_CLIENT_SIZE
#undef FUNC_NAME
#undef VAR_NAME

View File

@ -306,7 +306,7 @@ static inline void red_marshall_inval(RedChannelClient *rcc,
{
SpiceMsgDisplayInvalOne inval_one;
red_channel_client_init_send_data(rcc, cach_item->inval_type, NULL);
red_channel_client_init_send_data(rcc, SPICE_MSG_CURSOR_INVAL_ONE, NULL);
inval_one.id = *(uint64_t *)&cach_item->id;
spice_marshall_msg_cursor_inval_one(base_marshaller, &inval_one);

View File

@ -1776,7 +1776,7 @@ static inline void marshall_inval_palette(RedChannelClient *rcc,
{
SpiceMsgDisplayInvalOne inval_one;
red_channel_client_init_send_data(rcc, cache_item->inval_type, NULL);
red_channel_client_init_send_data(rcc, SPICE_MSG_DISPLAY_INVAL_PALETTE, NULL);
inval_one.id = *(uint64_t *)&cache_item->id;
spice_marshall_msg_display_inval_palette(base_marshaller, &inval_one);