[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/11] migration: Remove errp parameter in migration_fd_process_i
From: |
Avihai Horon |
Subject: |
[PATCH 04/11] migration: Remove errp parameter in migration_fd_process_incoming() |
Date: |
Sun, 31 Dec 2023 11:30:09 +0200 |
Errp parameter in migration_fd_process_incoming() is unused.
Remove it.
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
---
migration/migration.h | 2 +-
migration/migration.c | 2 +-
migration/rdma.c | 6 +-----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/migration/migration.h b/migration/migration.h
index b3c9288c38..17972dac34 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -474,7 +474,7 @@ struct MigrationState {
void migrate_set_state(int *state, int old_state, int new_state);
-void migration_fd_process_incoming(QEMUFile *f, Error **errp);
+void migration_fd_process_incoming(QEMUFile *f);
void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp);
void migration_incoming_process(void);
diff --git a/migration/migration.c b/migration/migration.c
index 55d77572d8..732e3dadd9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -774,7 +774,7 @@ static bool postcopy_try_recover(void)
return false;
}
-void migration_fd_process_incoming(QEMUFile *f, Error **errp)
+void migration_fd_process_incoming(QEMUFile *f)
{
migration_incoming_setup(f);
if (postcopy_try_recover()) {
diff --git a/migration/rdma.c b/migration/rdma.c
index 04debab5d9..94c0f871f0 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4035,7 +4035,6 @@ static void rdma_accept_incoming_migration(void *opaque)
{
RDMAContext *rdma = opaque;
QEMUFile *f;
- Error *local_err = NULL;
trace_qemu_rdma_accept_incoming_migration();
if (qemu_rdma_accept(rdma) < 0) {
@@ -4057,10 +4056,7 @@ static void rdma_accept_incoming_migration(void *opaque)
}
rdma->migration_started_on_destination = 1;
- migration_fd_process_incoming(f, &local_err);
- if (local_err) {
- error_reportf_err(local_err, "RDMA ERROR:");
- }
+ migration_fd_process_incoming(f);
}
void rdma_start_incoming_migration(InetSocketAddress *host_port,
--
2.26.3
- [PATCH 00/11] migration: Misc cleanups and fixes, Avihai Horon, 2023/12/31
- [PATCH 01/11] migration: Remove migrate_max_downtime() declaration, Avihai Horon, 2023/12/31
- [PATCH 02/11] migration: Remove nulling of hostname in migrate_init(), Avihai Horon, 2023/12/31
- [PATCH 03/11] migration: Refactor migration_incoming_setup(), Avihai Horon, 2023/12/31
- [PATCH 04/11] migration: Remove errp parameter in migration_fd_process_incoming(),
Avihai Horon <=
- [PATCH 05/11] migration/multifd: Fix error message in multifd_recv_initial_packet(), Avihai Horon, 2023/12/31
- [PATCH 06/11] migration/multifd: Simplify multifd_channel_connect() if else statement, Avihai Horon, 2023/12/31
- [PATCH 07/11] migration/multifd: Fix leaking of Error in TLS error flow, Avihai Horon, 2023/12/31
- [PATCH 08/11] migration/multifd: Remove error_setg() in migration_ioc_process_incoming(), Avihai Horon, 2023/12/31
- [PATCH 11/11] migration/multifd: Remove unnecessary usage of local Error, Avihai Horon, 2023/12/31
- [PATCH 10/11] migration: Remove unnecessary usage of local Error, Avihai Horon, 2023/12/31
- [PATCH 09/11] migration: Fix migration_channel_read_peek() error path, Avihai Horon, 2023/12/31