From 2f18466293804d60c98391cf1e167ec084d41abb Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Fri, 28 Oct 2016 11:55:36 +0100 Subject: [PATCH] Allows to have more than 1 QXL device This was introduced with 96e94c6f32d4345ea25ef7a474fbd92de03b38ad (Convert RedChannel hierarchy to GObject). The id of CursorChannel/DisplayChannel were always 0 causing a wrong assertion on the code. Signed-off-by: Frediano Ziglio Acked-by: Christophe Fergeau --- server/cursor-channel.c | 1 + server/display-channel.c | 1 + 2 files changed, 2 insertions(+) diff --git a/server/cursor-channel.c b/server/cursor-channel.c index df3561a2..8887691b 100644 --- a/server/cursor-channel.c +++ b/server/cursor-channel.c @@ -312,6 +312,7 @@ CursorChannel* cursor_channel_new(RedsState *server, QXLInstance *qxl, "spice-server", server, "core-interface", core, "channel-type", SPICE_CHANNEL_CURSOR, + "id", qxl->id, "migration-flags", 0, "qxl", qxl, "handle-acks", TRUE, diff --git a/server/display-channel.c b/server/display-channel.c index 63f99861..b483b577 100644 --- a/server/display-channel.c +++ b/server/display-channel.c @@ -1988,6 +1988,7 @@ DisplayChannel* display_channel_new(RedsState *reds, "spice-server", reds, "core-interface", core, "channel-type", SPICE_CHANNEL_DISPLAY, + "id", qxl->id, "migration-flags", (SPICE_MIGRATE_NEED_FLUSH | SPICE_MIGRATE_NEED_DATA_TRANSFER), "qxl", qxl,