From 717ed19a8b6759d821d2d4e2487bdcff5aab0865 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Wed, 5 Feb 2020 12:33:26 +0000 Subject: [PATCH] Constify display_channel_update_monitors_config config parameter No reason to change the structure. Signed-off-by: Frediano Ziglio --- server/display-channel.c | 4 ++-- server/display-channel.h | 2 +- server/red-worker.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/display-channel.c b/server/display-channel.c index d212d803..c721057a 100644 --- a/server/display-channel.c +++ b/server/display-channel.c @@ -189,7 +189,7 @@ static void monitors_config_debug(MonitorsConfig *mc) } } -static MonitorsConfig* monitors_config_new(QXLHead *heads, ssize_t nheads, ssize_t max) +static MonitorsConfig* monitors_config_new(const QXLHead *heads, ssize_t nheads, ssize_t max) { MonitorsConfig *mc; @@ -2453,7 +2453,7 @@ void display_channel_push_monitors_config(DisplayChannel *display) } void display_channel_update_monitors_config(DisplayChannel *display, - QXLMonitorsConfig *config, + const QXLMonitorsConfig *config, uint16_t count, uint16_t max_allowed) { diff --git a/server/display-channel.h b/server/display-channel.h index 2e0c1140..a4549bc7 100644 --- a/server/display-channel.h +++ b/server/display-channel.h @@ -145,7 +145,7 @@ void display_channel_gl_draw (DisplayCha SpiceMsgDisplayGlDraw *draw); void display_channel_gl_draw_done (DisplayChannel *display); -void display_channel_update_monitors_config(DisplayChannel *display, QXLMonitorsConfig *config, +void display_channel_update_monitors_config(DisplayChannel *display, const QXLMonitorsConfig *config, uint16_t count, uint16_t max_allowed); void display_channel_set_monitors_config_to_primary(DisplayChannel *display); void display_channel_push_monitors_config(DisplayChannel *display); diff --git a/server/red-worker.c b/server/red-worker.c index 1cb240d5..1d9c9055 100644 --- a/server/red-worker.c +++ b/server/red-worker.c @@ -637,7 +637,7 @@ static void handle_dev_monitors_config_async(void *opaque, void *payload) RedWorkerMessageMonitorsConfigAsync *msg = payload; RedWorker *worker = opaque; uint16_t count, max_allowed; - QXLMonitorsConfig *dev_monitors_config = + const QXLMonitorsConfig *dev_monitors_config = (QXLMonitorsConfig*)memslot_get_virt(&worker->mem_slots, msg->monitors_config, qxl_monitors_config_size(1), msg->group_id);