[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/22] multifd: cleanup the function multifd_channel_connect
From: |
Juan Quintela |
Subject: |
[PULL 02/22] multifd: cleanup the function multifd_channel_connect |
Date: |
Mon, 13 Feb 2023 03:51:30 +0100 |
From: Li Zhang <lizhang@suse.de>
Cleanup multifd_channel_connect
Signed-off-by: Li Zhang <lizhang@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/multifd.c | 43 +++++++++++++++++++++----------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index b7ad7002e0..c8132ab7e8 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -843,30 +843,29 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
ioc, object_get_typename(OBJECT(ioc)),
migrate_get_current()->hostname, error);
- if (!error) {
- if (migrate_channel_requires_tls_upgrade(ioc)) {
- multifd_tls_channel_connect(p, ioc, &error);
- if (!error) {
- /*
- * tls_channel_connect will call back to this
- * function after the TLS handshake,
- * so we mustn't call multifd_send_thread until then
- */
- return true;
- } else {
- return false;
- }
+ if (error) {
+ return false;
+ }
+ if (migrate_channel_requires_tls_upgrade(ioc)) {
+ multifd_tls_channel_connect(p, ioc, &error);
+ if (!error) {
+ /*
+ * tls_channel_connect will call back to this
+ * function after the TLS handshake,
+ * so we mustn't call multifd_send_thread until then
+ */
+ return true;
} else {
- migration_ioc_register_yank(ioc);
- p->registered_yank = true;
- p->c = ioc;
- qemu_thread_create(&p->thread, p->name, multifd_send_thread, p,
- QEMU_THREAD_JOINABLE);
- }
- return true;
+ return false;
+ }
+ } else {
+ migration_ioc_register_yank(ioc);
+ p->registered_yank = true;
+ p->c = ioc;
+ qemu_thread_create(&p->thread, p->name, multifd_send_thread, p,
+ QEMU_THREAD_JOINABLE);
}
-
- return false;
+ return true;
}
static void multifd_new_send_channel_cleanup(MultiFDSendParams *p,
--
2.39.1
- [PULL 15/22] migration: Cleanup postcopy_preempt_setup(), (continued)
- [PULL 15/22] migration: Cleanup postcopy_preempt_setup(), Xxx Xx, 2023/02/12
- [PULL 16/22] migration: Add a semaphore to count PONGs, Xxx Xx, 2023/02/12
- [PULL 17/22] migration: Postpone postcopy preempt channel to be after main, Xxx Xx, 2023/02/12
- [PULL 19/22] migration/multifd: Remove unnecessary assignment on multifd_load_cleanup(), Xxx Xx, 2023/02/12
- [PULL 20/22] migration/multifd: Join all multifd threads in order to avoid leaks, Xxx Xx, 2023/02/12
- [PULL 21/22] migration/multifd: Move load_cleanup inside incoming_state_destroy, Xxx Xx, 2023/02/12
- [PULL 22/22] ram: Document migration ram flags, Xxx Xx, 2023/02/12
- [PULL 18/22] migration/multifd: Change multifd_load_cleanup() signature and usage, Xxx Xx, 2023/02/12
- Re: [PULL 00/22] Migration 20230213 patches, Juan Quintela, 2023/02/12
- [PULL 00/22] Migration 20230213 patches, Juan Quintela, 2023/02/12
- [PULL 02/22] multifd: cleanup the function multifd_channel_connect,
Juan Quintela <=
- [PULL 01/22] migration: Remove spurious files, Juan Quintela, 2023/02/12
- [PULL 03/22] multifd: Remove some redundant code, Juan Quintela, 2023/02/12
- [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