summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/reds.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/server/reds.c b/server/reds.c
index 10d2ffc5..8e83b990 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -4205,22 +4205,20 @@ static void reds_mig_started(void)
reds->expect_migrate = TRUE;
if (reds->client_semi_mig_cap) {
+ reds->mig_inprogress = TRUE;
if (reds->mig_target) {
red_printf("previous spice migration hasn't completed yet. Waiting for client");
reds->mig_wait_prev_complete = TRUE;
core->timer_start(reds->mig_timer, MIGRATE_TIMEOUT);
- return;
+ } else {
+ reds_mig_connect();
}
- } else if (sif) {
- // switch host msg will be sent after migration completes
- sif->migrate_connect_complete(migration_interface);
- return;
+ } else {
+ if (sif) {
+ // switch host msg will be sent after migration completes
+ sif->migrate_connect_complete(migration_interface);
+ }
}
-
- reds->mig_inprogress = TRUE;
-
- reds_mig_connect();
- return;
}
static void reds_mig_finished(int completed)