[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 04/19] migration: Create migration_has_all_channe
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH v6 04/19] migration: Create migration_has_all_channels |
Date: |
Tue, 8 Aug 2017 18:22:09 +0200 |
This functions allows us to decide when to close the listener socket.
For now, we only need one connection.
Signed-off-by: Juan Quintela <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 86e41e8..2c42834 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -386,6 +386,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 99c398d..1881e4a 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 b02d37d..dee8690 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.9.4
- [Qemu-devel] [PATCH v6 00/19] Multifd, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 01/19] migration: Create migration_ioc_process_incoming(), Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 02/19] migration: Teach it about G_SOURCE_REMOVE, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 03/19] migration: Add comments to channel functions, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 04/19] migration: Create migration_has_all_channels,
Juan Quintela <=
- [Qemu-devel] [PATCH v6 05/19] qio: Create new qio_channel_{readv, writev}_all, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 06/19] migration: Add multifd capability, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 07/19] migration: Create x-multifd-threads parameter, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 08/19] migration: Create x-multifd-group parameter, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 09/19] migration: Create multifd migration threads, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 10/19] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 11/19] migration: Start of multiple fd work, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 12/19] migration: Create ram_multifd_page, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 13/19] migration: Really use multiple pages at a time, Juan Quintela, 2017/08/08
- [Qemu-devel] [PATCH v6 14/19] migration: Send the fd number which we are going to use for this page, Juan Quintela, 2017/08/08