[Spice-devel] [PATCH spice-server v2 2/8] fixup! Move CommonGraphicsChannel to a new file

Frediano Ziglio fziglio at redhat.com
Mon Oct 10 16:11:08 UTC 2016


From: Pavel Grunt <pgrunt at redhat.com>

---
 server/Makefile.am  | 4 ++--
 server/red-worker.c | 6 ++----
 server/red-worker.h | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/Makefile.am b/server/Makefile.am
index 3382946..036abcd 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -77,8 +77,8 @@ libserver_la_SOURCES =				\
 	cache-item.h				\
 	char-device.c				\
 	char-device.h				\
-	common-graphics-channel.c			\
-	common-graphics-channel.h			\
+	common-graphics-channel.c		\
+	common-graphics-channel.h		\
 	demarshallers.h				\
 	event-loop.c				\
 	glz-encoder.c				\
diff --git a/server/red-worker.c b/server/red-worker.c
index 085f4f3..2dfa8e4 100644
--- a/server/red-worker.c
+++ b/server/red-worker.c
@@ -1365,8 +1365,7 @@ RedWorker* red_worker_new(QXLInstance *qxl,
     worker->cursor_channel = cursor_channel_new(reds, qxl,
                                                 &worker->core);
     channel = RED_CHANNEL(worker->cursor_channel);
-    red_channel_set_stat_node(channel, stat_add_node(reds, worker->stat,
-                                                     "cursor_channel", TRUE));
+    red_channel_set_stat_node(channel, stat_add_node(reds, worker->stat, "cursor_channel", TRUE));
     red_channel_register_client_cbs(channel, client_cursor_cbs, dispatcher);
     reds_register_channel(reds, channel);
 
@@ -1377,8 +1376,7 @@ RedWorker* red_worker_new(QXLInstance *qxl,
                                                   init_info.n_surfaces);
 
     channel = RED_CHANNEL(worker->display_channel);
-    red_channel_set_stat_node(channel, stat_add_node(reds, worker->stat,
-                                                     "display_channel", TRUE));
+    red_channel_set_stat_node(channel, stat_add_node(reds, worker->stat, "display_channel", TRUE));
     red_channel_register_client_cbs(channel, client_display_cbs, dispatcher);
     red_channel_set_cap(channel, SPICE_DISPLAY_CAP_MONITORS_CONFIG);
     red_channel_set_cap(channel, SPICE_DISPLAY_CAP_PREF_COMPRESSION);
diff --git a/server/red-worker.h b/server/red-worker.h
index 370240f..dc2ff24 100644
--- a/server/red-worker.h
+++ b/server/red-worker.h
@@ -29,7 +29,6 @@ RedWorker* red_worker_new(QXLInstance *qxl,
                           const ClientCbs *client_cursor_cbs,
                           const ClientCbs *client_display_cbs);
 bool       red_worker_run(RedWorker *worker);
-SpiceCoreInterfaceInternal* red_worker_get_core_interface(RedWorker *worker);
 
 void red_drawable_unref(RedDrawable *red_drawable);
 
-- 
2.7.4



More information about the Spice-devel mailing list