diff options
| author | Li Zhijian <lizhijian@cn.fujitsu.com> | 2021-05-20 16:11:45 +0800 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2021-05-26 18:39:32 +0100 |
| commit | 4e812d2338acb354b969b59f792f413f567c0ace (patch) | |
| tree | e5f89af0367238e3cd0200ffb7a74653b7e9b39d /migration | |
| parent | efb208dc9c3f1e881aecff21fb1c7a7b6b869480 (diff) | |
| download | qemu-4e812d2338acb354b969b59f792f413f567c0ace.zip qemu-4e812d2338acb354b969b59f792f413f567c0ace.tar.gz qemu-4e812d2338acb354b969b59f792f413f567c0ace.tar.bz2 | |
migration/rdma: cleanup rdma in rdma_start_incoming_migration error path
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>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/rdma.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/migration/rdma.c b/migration/rdma.c index 41726cc..7e7595f 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) { |