[Spice-devel,spice-gtk,3/7] seamless-migration: update spice-common submodule

Submitted by Yonit Halperin on Aug. 15, 2012, 7:56 a.m.

Details

Message ID 1345017402-872-63-git-send-email-yhalperi@redhat.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Yonit Halperin Aug. 15, 2012, 7:56 a.m.
Update channel-main as well to support the change made to
SpiceMsgMainMigrationBegin: it now holds all the destination fields
inside SpiceMigrationDstInfo.
---
 gtk/channel-main.c |    6 +++---
 spice-common       |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 91c9167..bb0e361 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -86,7 +86,7 @@  typedef struct spice_migrate spice_migrate;
 
 struct spice_migrate {
     struct coroutine *from;
-    SpiceMsgMainMigrationBegin *info;
+    SpiceMigrationDstInfo *info;
     SpiceSession *session;
     guint nchannels;
     SpiceChannel *channel;
@@ -1653,7 +1653,7 @@  static gboolean migrate_connect(gpointer data)
         sport = info->sport;
         host = info->host;
     } else {
-        SpiceMsgMainMigrationBegin *info = mig->info;
+        SpiceMigrationDstInfo *info = mig->info;
         SPICE_DEBUG("migrate_begin %d %s %d %d",
                     info->host_size, info->host_data, info->port, info->sport);
         port = info->port;
@@ -1711,7 +1711,7 @@  static void main_handle_migrate_begin(SpiceChannel *channel, SpiceMsgIn *in)
     int reply_type;
 
     mig.channel = channel;
-    mig.info = msg;
+    mig.info = &msg->dst_info;
     mig.from = coroutine_self();
 
     /* no need to track idle, call is sync for this coroutine */
diff --git a/spice-common b/spice-common
index 7439137..692f77d 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@ 
-Subproject commit 7439137509f838f95d672454cb9c30def7f84f89
+Subproject commit 692f77d1cf2428442e724a19a1a204bf3c32be97

Comments

ack (once spice-common is updated)

On Wed, Aug 15, 2012 at 9:56 AM, Yonit Halperin <yhalperi@redhat.com> wrote:
> Update channel-main as well to support the change made to
> SpiceMsgMainMigrationBegin: it now holds all the destination fields
> inside SpiceMigrationDstInfo.
> ---
>  gtk/channel-main.c |    6 +++---
>  spice-common       |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/gtk/channel-main.c b/gtk/channel-main.c
> index 91c9167..bb0e361 100644
> --- a/gtk/channel-main.c
> +++ b/gtk/channel-main.c
> @@ -86,7 +86,7 @@ typedef struct spice_migrate spice_migrate;
>
>  struct spice_migrate {
>      struct coroutine *from;
> -    SpiceMsgMainMigrationBegin *info;
> +    SpiceMigrationDstInfo *info;
>      SpiceSession *session;
>      guint nchannels;
>      SpiceChannel *channel;
> @@ -1653,7 +1653,7 @@ static gboolean migrate_connect(gpointer data)
>          sport = info->sport;
>          host = info->host;
>      } else {
> -        SpiceMsgMainMigrationBegin *info = mig->info;
> +        SpiceMigrationDstInfo *info = mig->info;
>          SPICE_DEBUG("migrate_begin %d %s %d %d",
>                      info->host_size, info->host_data, info->port, info->sport);
>          port = info->port;
> @@ -1711,7 +1711,7 @@ static void main_handle_migrate_begin(SpiceChannel *channel, SpiceMsgIn *in)
>      int reply_type;
>
>      mig.channel = channel;
> -    mig.info = msg;
> +    mig.info = &msg->dst_info;
>      mig.from = coroutine_self();
>
>      /* no need to track idle, call is sync for this coroutine */
> diff --git a/spice-common b/spice-common
> index 7439137..692f77d 160000
> --- a/spice-common
> +++ b/spice-common
> @@ -1 +1 @@
> -Subproject commit 7439137509f838f95d672454cb9c30def7f84f89
> +Subproject commit 692f77d1cf2428442e724a19a1a204bf3c32be97
> --
> 1.7.7.6
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel