From 612c94c61bd77c4fd82c9ea42c2fd8f558de4fa9 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 23 May 2018 14:50:12 +0200 Subject: [PATCH] worker: Remove display_is_connected() It's only called once, and when it's called, we will have dereferenced worker->display_channel a few lines before in display_channel_set_monitors_config_to_primary(), so this cannot be NULL. The 'if (worker->display_channel)' check can thus be removed, so display_is_connected() becomes just red_channel_is_connected(). Signed-off-by: Christophe Fergeau Acked-by: Frediano Ziglio --- server/red-worker.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/server/red-worker.c b/server/red-worker.c index 541110f8..8424306d 100644 --- a/server/red-worker.c +++ b/server/red-worker.c @@ -93,12 +93,6 @@ struct RedWorker { GMainLoop *loop; }; -static int display_is_connected(RedWorker *worker) -{ - return worker->display_channel && - red_channel_is_connected(RED_CHANNEL(worker->display_channel)); -} - void red_drawable_unref(RedDrawable *red_drawable) { if (--red_drawable->refs) { @@ -529,7 +523,7 @@ static void dev_create_primary_surface(RedWorker *worker, uint32_t surface_id, CommonGraphicsChannel *common = COMMON_GRAPHICS_CHANNEL(display); RedChannel *channel = RED_CHANNEL(display); - if (display_is_connected(worker) && + if (red_channel_is_connected(channel) && !common_graphics_channel_get_during_target_migrate(common)) { /* guest created primary, so it will (hopefully) send a monitors_config * now, don't send our own temporary one */