> > From: Jonathon Jongsma <[email protected]> > > --- > server/reds.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/server/reds.c b/server/reds.c > index ffc9d4e..b8129fb 100644 > --- a/server/reds.c > +++ b/server/reds.c > @@ -406,7 +406,7 @@ static RedChannel *reds_find_channel(RedsState *reds, > uint32_t type, uint32_t id > return NULL; > } > > -static void reds_mig_cleanup(void) > +static void reds_mig_cleanup(RedsState *reds) > { > if (reds->mig_inprogress) { > > @@ -568,7 +568,7 @@ void reds_client_disconnect(RedClient *client) > free(reds->agent_state.mig_data); > reds->agent_state.mig_data = NULL; > > - reds_mig_cleanup(); > + reds_mig_cleanup(reds); > } > } > > @@ -582,7 +582,7 @@ static void reds_disconnect(void) > RING_FOREACH_SAFE(link, next, &reds->clients) { > reds_client_disconnect(SPICE_CONTAINEROF(link, RedClient, link)); > } > - reds_mig_cleanup(); > + reds_mig_cleanup(reds); > } > > static void reds_mig_disconnect(void) > @@ -590,7 +590,7 @@ static void reds_mig_disconnect(void) > if (reds_main_channel_connected()) { > reds_disconnect(); > } else { > - reds_mig_cleanup(); > + reds_mig_cleanup(reds); > } > } > > @@ -1107,7 +1107,7 @@ void reds_on_main_migrate_connected(int seamless) > { > reds->src_do_seamless_migrate = seamless; > if (reds->mig_wait_connect) { > - reds_mig_cleanup(); > + reds_mig_cleanup(reds); > } > } > > @@ -2889,7 +2889,7 @@ static void > reds_mig_remove_wait_disconnect_client(RedClient *client) > ring_remove(wait_client_item); > free(wait_client); > if (ring_is_empty(&reds->mig_wait_disconnect_clients)) { > - reds_mig_cleanup(); > + reds_mig_cleanup(reds); > } > return; > } > @@ -2921,7 +2921,7 @@ static void reds_mig_finished(int completed) > if (completed) { > reds_mig_fill_wait_disconnect(); > } else { > - reds_mig_cleanup(); > + reds_mig_cleanup(reds); > } > reds_mig_release(); > } > @@ -2945,7 +2945,7 @@ static void migrate_timeout(void *opaque) > main_channel_migrate_cancel_wait(reds->main_channel); > /* in case part of the client haven't yet completed the previous > migration, disconnect them */ > reds_mig_target_client_disconnect_all(); > - reds_mig_cleanup(); > + reds_mig_cleanup(reds); > } else { > reds_mig_disconnect(); > }
Acked-by: Frediano Ziglio <[email protected]> Frediano _______________________________________________ Spice-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/spice-devel
