diff options
author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 14:32:17 -0600 |
---|---|---|
committer | Fabiano FidĂȘncio <fidencio@redhat.com> | 2015-02-23 23:00:42 +0100 |
commit | 19d0597d41e8d00e0bd5adf8cb67b29fff2cfd12 (patch) | |
tree | e730f4b382a1c034b6fba5d2287ef246f8e0789b | |
parent | f6df3d38e0cfaebd796e3b743ee685f185c4ff72 (diff) | |
download | spice-19d0597d41e8d00e0bd5adf8cb67b29fff2cfd12.tar.gz spice-19d0597d41e8d00e0bd5adf8cb67b29fff2cfd12.tar.xz spice-19d0597d41e8d00e0bd5adf8cb67b29fff2cfd12.zip |
Change reds_mig_cleanup() to take RedsState arg
-rw-r--r-- | server/reds.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/reds.c b/server/reds.c index 269a2f30..862cda1e 100644 --- a/server/reds.c +++ b/server/reds.c @@ -351,7 +351,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) { @@ -513,7 +513,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); } } @@ -527,7 +527,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) @@ -535,7 +535,7 @@ static void reds_mig_disconnect(void) if (reds_main_channel_connected()) { reds_disconnect(); } else { - reds_mig_cleanup(); + reds_mig_cleanup(reds); } } @@ -1052,7 +1052,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); } } @@ -2763,7 +2763,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; } @@ -2795,7 +2795,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(); } @@ -2819,7 +2819,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(); } |