aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvihai Horon <avihaih@nvidia.com>2023-12-31 11:30:09 +0200
committerPeter Xu <peterx@redhat.com>2024-01-04 09:52:42 +0800
commitb0cf3bfc69752969314f9e88d68f75f40fcdf274 (patch)
tree89bdf93a28199ba03a36c5c8098a94aac78ad5dd
parentc606f3baa2de0ee40a3cc69142a23fff130debc3 (diff)
downloadqemu-b0cf3bfc69752969314f9e88d68f75f40fcdf274.zip
qemu-b0cf3bfc69752969314f9e88d68f75f40fcdf274.tar.gz
qemu-b0cf3bfc69752969314f9e88d68f75f40fcdf274.tar.bz2
migration: Remove errp parameter in migration_fd_process_incoming()
Errp parameter in migration_fd_process_incoming() is unused. Remove it. Signed-off-by: Avihai Horon <avihaih@nvidia.com> Reviewed-by: Fabiano Rosas <farosas@suse.de> Link: https://lore.kernel.org/r/20231231093016.14204-5-avihaih@nvidia.com Signed-off-by: Peter Xu <peterx@redhat.com>
-rw-r--r--migration/migration.c2
-rw-r--r--migration/migration.h2
-rw-r--r--migration/rdma.c6
3 files changed, 3 insertions, 7 deletions
diff --git a/migration/migration.c b/migration/migration.c
index e7d342a..8bb1a81 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/migration.h b/migration/migration.h
index b3c9288..17972da 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/rdma.c b/migration/rdma.c
index 04debab..94c0f87 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,