[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/19] migration: Move channel setup out of postcopy_try_recov
From: |
Peter Xu |
Subject: |
[PATCH v4 06/19] migration: Move channel setup out of postcopy_try_recover() |
Date: |
Thu, 31 Mar 2022 11:08:44 -0400 |
We used to use postcopy_try_recover() to replace migration_incoming_setup() to
setup incoming channels. That's fine for the old world, but in the new world
there can be more than one channels that need setup. Better move the channel
setup out of it so that postcopy_try_recover() only handles the last phase of
switching to the recovery phase.
To do that in migration_fd_process_incoming(), move the postcopy_try_recover()
call to be after migration_incoming_setup(), which will setup the channels.
While in migration_ioc_process_incoming(), postpone the recover() routine right
before we'll jump into migration_incoming_process().
A side benefit is we don't need to pass in QEMUFile* to postcopy_try_recover()
anymore. Remove it.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 596d3d30b4..8ecf78f2c7 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -671,19 +671,20 @@ void migration_incoming_process(void)
}
/* Returns true if recovered from a paused migration, otherwise false */
-static bool postcopy_try_recover(QEMUFile *f)
+static bool postcopy_try_recover(void)
{
MigrationIncomingState *mis = migration_incoming_get_current();
if (mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
/* Resumed from a paused postcopy migration */
- mis->from_src_file = f;
+ /* This should be set already in migration_incoming_setup() */
+ assert(mis->from_src_file);
/* Postcopy has standalone thread to do vm load */
- qemu_file_set_blocking(f, true);
+ qemu_file_set_blocking(mis->from_src_file, true);
/* Re-configure the return path */
- mis->to_src_file = qemu_file_get_return_path(f);
+ mis->to_src_file = qemu_file_get_return_path(mis->from_src_file);
migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_PAUSED,
MIGRATION_STATUS_POSTCOPY_RECOVER);
@@ -704,11 +705,10 @@ static bool postcopy_try_recover(QEMUFile *f)
void migration_fd_process_incoming(QEMUFile *f, Error **errp)
{
- if (postcopy_try_recover(f)) {
+ if (!migration_incoming_setup(f, errp)) {
return;
}
-
- if (!migration_incoming_setup(f, errp)) {
+ if (postcopy_try_recover()) {
return;
}
migration_incoming_process();
@@ -724,11 +724,6 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error
**errp)
/* The first connection (multifd may have multiple) */
QEMUFile *f = qemu_fopen_channel_input(ioc);
- /* If it's a recovery, we're done */
- if (postcopy_try_recover(f)) {
- return;
- }
-
if (!migration_incoming_setup(f, errp)) {
return;
}
@@ -749,6 +744,10 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error
**errp)
}
if (start_migration) {
+ /* If it's a recovery, we're done */
+ if (postcopy_try_recover()) {
+ return;
+ }
migration_incoming_process();
}
}
--
2.32.0
- [PATCH v4 00/19] migration: Postcopy Preemption, Peter Xu, 2022/03/31
- [PATCH v4 06/19] migration: Move channel setup out of postcopy_try_recover(),
Peter Xu <=
- [PATCH v4 04/19] migration: Move migrate_allow_multifd and helpers into migration.c, Peter Xu, 2022/03/31
- [PATCH v4 05/19] migration: Export ram_load_postcopy(), Peter Xu, 2022/03/31
- [PATCH v4 07/19] migration: Allow migrate-recover to run multiple times, Peter Xu, 2022/03/31
- [PATCH v4 09/19] migration: Postcopy preemption preparation on channel creation, Peter Xu, 2022/03/31
- [PATCH v4 08/19] migration: Add postcopy-preempt capability, Peter Xu, 2022/03/31
- [PATCH v4 12/19] migration: Create the postcopy preempt channel asynchronously, Peter Xu, 2022/03/31
- [PATCH v4 11/19] migration: Postcopy recover with preempt enabled, Peter Xu, 2022/03/31
- [PATCH v4 14/19] migration: Add helpers to detect TLS capability, Peter Xu, 2022/03/31
- [PATCH v4 17/19] tests: Add postcopy tls migration test, Peter Xu, 2022/03/31
- [PATCH v4 15/19] migration: Export tls-[creds|hostname|authz] params to cmdline too, Peter Xu, 2022/03/31