[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/22] migration: Cleanup postcopy_preempt_setup()
From: |
Juan Quintela |
Subject: |
[PULL 15/22] migration: Cleanup postcopy_preempt_setup() |
Date: |
Mon, 13 Feb 2023 03:51:43 +0100 |
From: Peter Xu <peterx@redhat.com>
Since we just dropped the only case where postcopy_preempt_setup() can
return an error, it doesn't need a retval anymore because it never fails.
Move the preempt check to the caller, preparing it to be used elsewhere to
do nothing but as simple as kicking the async connection.
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/postcopy-ram.h | 2 +-
migration/migration.c | 8 ++------
migration/postcopy-ram.c | 8 +-------
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h
index 25881c4127..d5604cbcf1 100644
--- a/migration/postcopy-ram.h
+++ b/migration/postcopy-ram.h
@@ -191,7 +191,7 @@ enum PostcopyChannels {
};
void postcopy_preempt_new_channel(MigrationIncomingState *mis, QEMUFile *file);
-int postcopy_preempt_setup(MigrationState *s, Error **errp);
+void postcopy_preempt_setup(MigrationState *s);
int postcopy_preempt_wait_channel(MigrationState *s);
#endif
diff --git a/migration/migration.c b/migration/migration.c
index f242d657e8..fb0ecf5649 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -4347,12 +4347,8 @@ void migrate_fd_connect(MigrationState *s, Error
*error_in)
}
/* This needs to be done before resuming a postcopy */
- if (postcopy_preempt_setup(s, &local_err)) {
- error_report_err(local_err);
- migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
- MIGRATION_STATUS_FAILED);
- migrate_fd_cleanup(s);
- return;
+ if (migrate_postcopy_preempt()) {
+ postcopy_preempt_setup(s);
}
if (resume) {
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 9a9d0ecf49..de6d4a3fd4 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -1629,16 +1629,10 @@ int postcopy_preempt_wait_channel(MigrationState *s)
return s->postcopy_qemufile_src ? 0 : -1;
}
-int postcopy_preempt_setup(MigrationState *s, Error **errp)
+void postcopy_preempt_setup(MigrationState *s)
{
- if (!migrate_postcopy_preempt()) {
- return 0;
- }
-
/* Kick an async task to connect */
socket_send_channel_create(postcopy_preempt_send_channel_new, s);
-
- return 0;
}
static void postcopy_pause_ram_fast_load(MigrationIncomingState *mis)
--
2.39.1
- [PULL 04/22] linux-headers: Update to v6.1, (continued)
- [PULL 04/22] linux-headers: Update to v6.1, Juan Quintela, 2023/02/12
- [PULL 05/22] util/userfaultfd: Support /dev/userfaultfd, Juan Quintela, 2023/02/12
- [PULL 06/22] migration: Simplify ram_find_and_save_block(), Juan Quintela, 2023/02/12
- [PULL 07/22] migration: Make find_dirty_block() return a single parameter, Juan Quintela, 2023/02/12
- [PULL 08/22] migration: Split ram_bytes_total_common() in two functions, Juan Quintela, 2023/02/12
- [PULL 09/22] migration: Calculate ram size once, Juan Quintela, 2023/02/12
- [PULL 10/22] migration: Make ram_save_target_page() a pointer, Juan Quintela, 2023/02/12
- [PULL 14/22] migration: Rework multi-channel checks on URI, Juan Quintela, 2023/02/12
- [PULL 12/22] AVX512 support for xbzrle_encode_buffer, Juan Quintela, 2023/02/12
- [PULL 13/22] Update bench-code for addressing CI problem, Juan Quintela, 2023/02/12
- [PULL 15/22] migration: Cleanup postcopy_preempt_setup(),
Juan Quintela <=
- [PULL 16/22] migration: Add a semaphore to count PONGs, Juan Quintela, 2023/02/12
- [PULL 17/22] migration: Postpone postcopy preempt channel to be after main, Juan Quintela, 2023/02/12
- [PULL 18/22] migration/multifd: Change multifd_load_cleanup() signature and usage, Juan Quintela, 2023/02/12
- [PULL 19/22] migration/multifd: Remove unnecessary assignment on multifd_load_cleanup(), Juan Quintela, 2023/02/12
- [PULL 20/22] migration/multifd: Join all multifd threads in order to avoid leaks, Juan Quintela, 2023/02/12
- [PULL 22/22] ram: Document migration ram flags, Juan Quintela, 2023/02/12
- [PULL 21/22] migration/multifd: Move load_cleanup inside incoming_state_destroy, Juan Quintela, 2023/02/12
- [PULL 11/22] migration: I messed state_pending_exact/estimate, Juan Quintela, 2023/02/12
- Re: [PULL 00/22] Migration 20230213 patches, Peter Maydell, 2023/02/13