[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/15] migration/rdma: cleanup rdma in rdma_start_incoming_migrati
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 12/15] migration/rdma: cleanup rdma in rdma_start_incoming_migration error path |
Date: |
Wed, 26 May 2021 18:45:37 +0100 |
From: Li Zhijian <lizhijian@cn.fujitsu.com>
the error path after calling qemu_rdma_dest_init() should do rdma cleanup
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Message-Id: <20210520081148.17001-1-lizhijian@cn.fujitsu.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-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.31.1
- [PULL 05/15] virtiofsd: get rid of in_sg_left variable, (continued)
- [PULL 05/15] virtiofsd: get rid of in_sg_left variable, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 04/15] virtiofsd: Use iov_discard_front() to skip bytes, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 06/15] virtiofsd: Simplify skip byte logic, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 08/15] virtiofsd: Set req->reply_sent right after sending reply, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 07/15] virtiofsd: Check EOF before short read, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 10/15] tools/virtiofsd/fuse_opt.c: Replaced a malloc with GLib's g_try_malloc, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 11/15] migration/rdma: Fix cm_event used before being initialized, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 14/15] migration/rdma: destination: create the return patch after the first accept, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 15/15] migration/rdma: source: poll cm_event from return path, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 09/15] tools/virtiofsd/buffer.c: replaced a calloc call with GLib's g_try_new0, Dr. David Alan Gilbert (git), 2021/05/26
- [PULL 12/15] migration/rdma: cleanup rdma in rdma_start_incoming_migration error path,
Dr. David Alan Gilbert (git) <=
- [PULL 13/15] migration/rdma: Fix rdma_addrinfo res leaks, Dr. David Alan Gilbert (git), 2021/05/26
- Re: [PULL 00/15] migration/virtiofs/hmp queue, Peter Maydell, 2021/05/27