migration: Remove errp parameter in migration_fd_process_incoming()
authorAvihai Horon <avihaih@nvidia.com>
Sun, 31 Dec 2023 09:30:09 +0000 (11:30 +0200)
committerPeter Xu <peterx@redhat.com>
Thu, 4 Jan 2024 01:52:42 +0000 (09:52 +0800)
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>
migration/migration.c
migration/migration.h
migration/rdma.c

index e7d342ab594732636ef85f79f6b2ce4752c19b99..8bb1a8134edd6e87dd3ef4c6d01fdc8d863668f4 100644 (file)
@@ -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()) {
index b3c9288c383994be01c795f8d0f17a8821458478..17972dac34e1341f2991041b17145f59564d271c 100644 (file)
@@ -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);
 
index 04debab5d94ce9300754a69e939b12cb2ba5bfd7..94c0f871f0a111acd1b933bde1c14e817764c2e7 100644 (file)
@@ -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,