[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] migration/multifd: multifd_load_cleanup() always re
From: |
Wei Yang |
Subject: |
[Qemu-devel] [PATCH] migration/multifd: multifd_load_cleanup() always return 0 |
Date: |
Mon, 22 Jul 2019 14:24:35 +0800 |
multifd_load_cleanup() always return 0 and never use the errp, just
cleanup a little.
Signed-off-by: Wei Yang <address@hidden>
---
migration/migration.c | 9 ++-------
migration/ram.c | 7 +++----
migration/ram.h | 2 +-
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 27ca10122f..38d2fdfa73 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -399,10 +399,7 @@ static void process_incoming_migration_bh(void *opaque)
*/
qemu_announce_self(&mis->announce_timer, migrate_announce_params());
- if (multifd_load_cleanup(&local_err) != 0) {
- error_report_err(local_err);
- autostart = false;
- }
+ multifd_load_cleanup();
/* If global state section was not received or we are in running
state, we need to obey autostart. Any other state is set with
runstate_set. */
@@ -506,9 +503,7 @@ fail:
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
MIGRATION_STATUS_FAILED);
qemu_fclose(mis->from_src_file);
- if (multifd_load_cleanup(&local_err) != 0) {
- error_report_err(local_err);
- }
+ multifd_load_cleanup();
exit(EXIT_FAILURE);
}
diff --git a/migration/ram.c b/migration/ram.c
index 66792568e2..7d30f8484c 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1243,13 +1243,12 @@ static void multifd_recv_terminate_threads(Error *err)
}
}
-int multifd_load_cleanup(Error **errp)
+void multifd_load_cleanup(void)
{
int i;
- int ret = 0;
if (!migrate_use_multifd()) {
- return 0;
+ return;
}
multifd_recv_terminate_threads(NULL);
for (i = 0; i < migrate_multifd_channels(); i++) {
@@ -1276,7 +1275,7 @@ int multifd_load_cleanup(Error **errp)
g_free(multifd_recv_state);
multifd_recv_state = NULL;
- return ret;
+ return;
}
static void multifd_recv_sync_main(void)
diff --git a/migration/ram.h b/migration/ram.h
index e0a499b956..6fdd449899 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -44,7 +44,7 @@ uint64_t ram_bytes_total(void);
int multifd_save_setup(void);
void multifd_save_cleanup(void);
int multifd_load_setup(void);
-int multifd_load_cleanup(Error **errp);
+void multifd_load_cleanup(void);
bool multifd_recv_all_channels_created(void);
bool multifd_recv_new_channel(QIOChannel *ioc, Error **errp);
--
2.17.1
- [Qemu-devel] [PATCH] migration/multifd: multifd_load_cleanup() always return 0,
Wei Yang <=