[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/16] migration: Create migration_has_all_channels
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 04/16] migration: Create migration_has_all_channels |
Date: |
Wed, 20 Sep 2017 12:46:27 +0200 |
This function allows us to decide when to close the listener socket.
For now, we only need one connection.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
---
migration/migration.c | 11 +++++++++++
migration/migration.h | 2 ++
migration/socket.c | 10 +++++++---
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;
+ }
}
--
2.13.5
- [Qemu-devel] [PULL 00/16] Migration PULL request, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 02/16] migration: Teach it about G_SOURCE_REMOVE, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 04/16] migration: Create migration_has_all_channels,
Juan Quintela <=
- [Qemu-devel] [PULL 12/16] bitmap: provide to_le/from_le helpers, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 09/16] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 10/16] bitmap: remove BITOP_WORD(), Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 13/16] migration: pass MigrationIncomingState* into migration check functions, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 03/16] migration: Add comments to channel functions, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 05/16] migration: Add multifd capability, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 06/16] migration: Create x-multifd-channels parameter, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 08/16] migration: Create multifd migration threads, Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 01/16] migration: Create migration_ioc_process_incoming(), Juan Quintela, 2017/09/20
- [Qemu-devel] [PULL 14/16] migration: fix hardcoded function name in error report, Juan Quintela, 2017/09/20