From 46c83dfe1ff13cb7d8c556c609914dafeee040c8 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Wed, 4 May 2016 15:32:25 -0500 Subject: [PATCH] Rename display_channel_set_monitors_config_to_primary() Since this function is a DisplayChannel method, use a name consistent with naming conventions. Acked-by: Pavel Grunt --- server/display-channel.c | 2 +- server/display-channel.h | 2 +- server/red-worker.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/display-channel.c b/server/display-channel.c index cd0cecf2..61f55a6b 100644 --- a/server/display-channel.c +++ b/server/display-channel.c @@ -2080,7 +2080,7 @@ void display_channel_update_monitors_config(DisplayChannel *display, monitors_config_new(config->heads, count, max_allowed); } -void set_monitors_config_to_primary(DisplayChannel *display) +void display_channel_set_monitors_config_to_primary(DisplayChannel *display) { DrawContext *context = &display->priv->surfaces[0].context; QXLHead head = { 0, }; diff --git a/server/display-channel.h b/server/display-channel.h index dd7ec8d3..2f7df55d 100644 --- a/server/display-channel.h +++ b/server/display-channel.h @@ -299,7 +299,7 @@ void display_channel_gl_draw_done (DisplayCha void display_channel_update_monitors_config(DisplayChannel *display, QXLMonitorsConfig *config, uint16_t count, uint16_t max_allowed); -void set_monitors_config_to_primary(DisplayChannel *display); +void display_channel_set_monitors_config_to_primary(DisplayChannel *display); gboolean display_channel_validate_surface(DisplayChannel *display, uint32_t surface_id); gboolean display_channel_surface_has_canvas(DisplayChannel *display, uint32_t surface_id); diff --git a/server/red-worker.c b/server/red-worker.c index 2cde7fdf..62e5d863 100644 --- a/server/red-worker.c +++ b/server/red-worker.c @@ -634,7 +634,7 @@ static void dev_create_primary_surface(RedWorker *worker, uint32_t surface_id, display_channel_create_surface(display, 0, surface.width, surface.height, surface.stride, surface.format, line_0, surface.flags & QXL_SURF_FLAG_KEEP_DATA, TRUE); - set_monitors_config_to_primary(display); + display_channel_set_monitors_config_to_primary(display); if (display_is_connected(worker) && !worker->display_channel->common.during_target_migrate) { /* guest created primary, so it will (hopefully) send a monitors_config