[Spice-commits] 3 commits - server/cursor-channel.c server/display-channel.c server/red-channel.c

[Frediano Ziglio]

 server/cursor-channel.c  |    2 ++
 server/display-channel.c |    2 ++
 server/red-channel.c     |    4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 2f18466293804d60c98391cf1e167ec084d41abb
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Oct 28 11:55:36 2016 +0100

    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 <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/cursor-channel.c b/server/cursor-channel.c
index df3561a..8887691 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 63f9986..b483b57 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,
commit 6fe8d5d49d1371e8474bd4a9ea9ccd1abf6f444f
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Oct 27 13:23:25 2016 +0100

    Call parent constructor always at the beginning
    
    In this case there is not much change but better
    to follow that style as all other constructors
    do.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/red-channel.c b/server/red-channel.c
index 3b14fbf..8f9ae6c 100644
--- a/server/red-channel.c
+++ b/server/red-channel.c
@@ -226,6 +226,8 @@ red_channel_constructed(GObject *object)
 
     RedChannelClass *klass = RED_CHANNEL_GET_CLASS(self);
 
+    G_OBJECT_CLASS(red_channel_parent_class)->constructed(object);
+
     spice_assert(klass->config_socket && klass->on_disconnect &&
                  klass->alloc_recv_buf && klass->release_recv_buf);
     spice_assert(klass->handle_migrate_data ||
@@ -238,8 +240,6 @@ red_channel_constructed(GObject *object)
     self->priv->incoming_cb.handle_message = (handle_message_proc)klass->handle_message;
     self->priv->incoming_cb.handle_parsed = (handle_parsed_proc)klass->handle_parsed;
     self->priv->incoming_cb.parser = klass->parser;
-
-    G_OBJECT_CLASS(red_channel_parent_class)->constructed(object);
 }
 
 static void red_channel_client_default_connect(RedChannel *channel, RedClient *client,
commit 695dd7c58d367aec5f0c2f3fe7f00f174e090520
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Wed Oct 26 08:45:11 2016 +0100

    Fix handle-acks regression
    
    This was introduced with 96e94c6f32d4345ea25ef7a474fbd92de03b38ad
    (Convert RedChannel hierarchy to GObject).
    The handle-acks settings was TRUE for CursorChannel and DisplayChannel.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/cursor-channel.c b/server/cursor-channel.c
index dbe3dfc..df3561a 100644
--- a/server/cursor-channel.c
+++ b/server/cursor-channel.c
@@ -314,6 +314,7 @@ CursorChannel* cursor_channel_new(RedsState *server, QXLInstance *qxl,
                         "channel-type", SPICE_CHANNEL_CURSOR,
                         "migration-flags", 0,
                         "qxl", qxl,
+                        "handle-acks", TRUE,
                         NULL);
 }
 
diff --git a/server/display-channel.c b/server/display-channel.c
index bcf26bb..63f9986 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -1993,6 +1993,7 @@ DisplayChannel* display_channel_new(RedsState *reds,
                            "qxl", qxl,
                            "n-surfaces", n_surfaces,
                            "video-codecs", video_codecs,
+                           "handle-acks", TRUE,
                            NULL);
     if (display) {
         display_channel_set_stream_video(display, stream_video);