| Message ID | 20210520081148.17001-1-lizhijian@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND,1/4] migration/rdma: cleanup rmda in rdma_start_incoming_migration error path | expand |
* Li Zhijian (lizhijian@cn.fujitsu.com) wrote: > the error path after calling qemu_rdma_dest_init() should do rdma cleanup > > Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/rdma.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/migration/rdma.c b/migration/rdma.c > index 41726cc74a..7e7595faab 100644 > --- a/migration/rdma.c > +++ b/migration/rdma.c > @@ -4040,7 +4040,7 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) > > if (ret) { > ERROR(errp, "listening on socket!"); > - goto err; > + goto cleanup_rdma; > } > > trace_rdma_start_incoming_migration_after_rdma_listen(); > @@ -4050,7 +4050,7 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) > rdma_return_path = qemu_rdma_data_init(host_port, &local_err); > > if (rdma_return_path == NULL) { > - goto err; > + goto cleanup_rdma; > } > > qemu_rdma_return_path_dest_init(rdma_return_path, rdma); > @@ -4059,6 +4059,9 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) > qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration, > NULL, (void *)(intptr_t)rdma); > return; > + > +cleanup_rdma: > + qemu_rdma_cleanup(rdma); > err: > error_propagate(errp, local_err); > if (rdma) { > -- > 2.30.2 > > >
diff --git a/migration/rdma.c b/migration/rdma.c index 41726cc74a..7e7595faab 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -4040,7 +4040,7 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) if (ret) { ERROR(errp, "listening on socket!"); - goto err; + goto cleanup_rdma; } trace_rdma_start_incoming_migration_after_rdma_listen(); @@ -4050,7 +4050,7 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) rdma_return_path = qemu_rdma_data_init(host_port, &local_err); if (rdma_return_path == NULL) { - goto err; + goto cleanup_rdma; } qemu_rdma_return_path_dest_init(rdma_return_path, rdma); @@ -4059,6 +4059,9 @@ void rdma_start_incoming_migration(const char *host_port, Error **errp) qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration, NULL, (void *)(intptr_t)rdma); return; + +cleanup_rdma: + qemu_rdma_cleanup(rdma); err: error_propagate(errp, local_err); if (rdma) {
the error path after calling qemu_rdma_dest_init() should do rdma cleanup Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com> --- migration/rdma.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)