From 1b2c3e40678f01ac4e3c714d243f65642de254be Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Thu, 29 Oct 2015 17:30:33 +0000 Subject: [PATCH] worker: avoid to use constant directly for capabilities size Acked-by: Jonathon Jongsma --- server/red_worker.c | 2 +- server/spice-qxl.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/red_worker.c b/server/red_worker.c index 96c0f143..2b23ffdb 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -9802,7 +9802,7 @@ static void guest_set_client_capabilities(RedWorker *worker) DisplayChannelClient *dcc; RedChannelClient *rcc; RingItem *link, *next; - uint8_t caps[58] = { 0 }; + uint8_t caps[SPICE_CAPABILITIES_SIZE] = { 0 }; int caps_available[] = { SPICE_DISPLAY_CAP_SIZED_STREAM, SPICE_DISPLAY_CAP_MONITORS_CONFIG, diff --git a/server/spice-qxl.h b/server/spice-qxl.h index dd49a860..e1f14e77 100644 --- a/server/spice-qxl.h +++ b/server/spice-qxl.h @@ -24,6 +24,10 @@ #include "spice-core.h" +#ifndef SPICE_CAPABILITIES_SIZE +#define SPICE_CAPABILITIES_SIZE (sizeof(((QXLRom*)0)->client_capabilities)) +#endif + /* qxl interface */ #define SPICE_INTERFACE_QXL "qxl" @@ -175,7 +179,7 @@ struct QXLInterface { uint32_t num_updated_rects); void (*set_client_capabilities)(QXLInstance *qin, uint8_t client_present, - uint8_t caps[58]); + uint8_t caps[SPICE_CAPABILITIES_SIZE]); /* returns 1 if the interface is supported, 0 otherwise. * if monitors_config is NULL nothing is done except reporting the * return code. */