aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-07-24 13:06:25 +0200
committerJuan Quintela <quintela@redhat.com>2017-09-22 14:11:19 +0200
commit428d89084c709e568f9cd301c2f6416a54c53d6d (patch)
tree3c9d0dfc27a0d55e904247282515c877e8e7715e
parent8e1a1931ca9bcb09b9db1180c9c08ecd5cc6b4de (diff)
migration: Create migration_has_all_channels
This function allows us to decide when to close the listener socket. For now, we only need one connection. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
-rw-r--r--migration/migration.c11
-rw-r--r--migration/migration.h2
-rw-r--r--migration/socket.c10
3 files changed, 20 insertions, 3 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 2d4c56e612..bac4a99277 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -384,6 +384,17 @@ void migration_ioc_process_incoming(QIOChannel *ioc)
/* We still only have a single channel. Nothing to do here yet */
}
+/**
+ * @migration_has_all_channels: We have received all channels that we need
+ *
+ * Returns true when we have got connections to all the channels that
+ * we need for migration.
+ */
+bool migration_has_all_channels(void)
+{
+ return true;
+}
+
/*
* Send a 'SHUT' message on the return channel with the given value
* to indicate that we've finished with the RP. Non-0 value indicates
diff --git a/migration/migration.h b/migration/migration.h
index 99c398d484..1881e4a754 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -155,6 +155,8 @@ void migrate_set_state(int *state, int old_state, int new_state);
void migration_fd_process_incoming(QEMUFile *f);
void migration_ioc_process_incoming(QIOChannel *ioc);
+bool migration_has_all_channels(void);
+
uint64_t migrate_max_downtime(void);
void migrate_fd_error(MigrationState *s, const Error *error);
diff --git a/migration/socket.c b/migration/socket.c
index b02d37d7a3..dee869044a 100644
--- a/migration/socket.c
+++ b/migration/socket.c
@@ -152,9 +152,13 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
object_unref(OBJECT(sioc));
out:
- /* Close listening socket as its no longer needed */
- qio_channel_close(ioc, NULL);
- return G_SOURCE_REMOVE;
+ if (migration_has_all_channels()) {
+ /* Close listening socket as its no longer needed */
+ qio_channel_close(ioc, NULL);
+ return G_SOURCE_REMOVE;
+ } else {
+ return G_SOURCE_CONTINUE;
+ }
}