[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/17] migration: Move local_err check in migration_ioc_process_i
From: |
Avihai Horon |
Subject: |
[PATCH 02/17] migration: Move local_err check in migration_ioc_process_incoming() |
Date: |
Thu, 25 Jan 2024 18:25:13 +0200 |
local_err in migration_ioc_process_incoming() is used only in the
multifd if branch. Move the local_err check under the multifd branch,
where it is actually used.
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
---
migration/migration.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 6fc544711a..ccd497ca21 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -863,15 +863,15 @@ void migration_ioc_process_incoming(QIOChannel *ioc,
Error **errp)
assert(migration_needs_multiple_sockets());
if (migrate_multifd()) {
multifd_recv_new_channel(ioc, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
} else {
assert(migrate_postcopy_preempt());
f = qemu_file_new_input(ioc);
postcopy_preempt_new_channel(mis, f);
}
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
}
if (migration_should_start_incoming(default_channel)) {
--
2.26.3
- [PATCH 00/17] migration: Add new migration channel connect and TLS upgrade APIs, Avihai Horon, 2024/01/25
- [PATCH 01/17] migration: Fix logic of channels and transport compatibility check, Avihai Horon, 2024/01/25
- [PATCH 02/17] migration: Move local_err check in migration_ioc_process_incoming(),
Avihai Horon <=
- [PATCH 03/17] migration: Rename default_channel to main_channel, Avihai Horon, 2024/01/25
- [PATCH 10/17] migration/postcopy: Use the new TLS upgrade API for preempt channel, Avihai Horon, 2024/01/25
- [PATCH 11/17] migration/tls: Make migration_tls_client_create() static, Avihai Horon, 2024/01/25
- [PATCH 12/17] migration/multifd: Consolidate TLS/non-TLS multifd channel error flow, Avihai Horon, 2024/01/25
- [PATCH 04/17] migration/multifd: Set p->running = true in the right place, Avihai Horon, 2024/01/25