qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, kwolf@redhat.com, vgoyal@redhat.com,
	ma.mandourr@gmail.com, lizhijian@cn.fujitsu.com
Cc: peterx@redhat.com, stefanha@redhat.com
Subject: [PULL 12/15] migration/rdma: cleanup rdma in rdma_start_incoming_migration error path
Date: Wed, 26 May 2021 18:45:37 +0100	[thread overview]
Message-ID: <20210526174540.290588-13-dgilbert@redhat.com> (raw)
In-Reply-To: <20210526174540.290588-1-dgilbert@redhat.com>

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



  parent reply	other threads:[~2021-05-26 18:18 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-26 17:45 [PULL 00/15] migration/virtiofs/hmp queue Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 01/15] hmp: Fix loadvm to resume the VM on success instead of failure Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 02/15] virtiofsd: Check for EINTR in preadv() and retry Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 03/15] virtiofsd: Get rid of unreachable code in read Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 04/15] virtiofsd: Use iov_discard_front() to skip bytes Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 05/15] virtiofsd: get rid of in_sg_left variable Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 06/15] virtiofsd: Simplify skip byte logic Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 07/15] virtiofsd: Check EOF before short read Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 08/15] virtiofsd: Set req->reply_sent right after sending reply Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [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 17:45 ` [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 17:45 ` [PULL 11/15] migration/rdma: Fix cm_event used before being initialized Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` Dr. David Alan Gilbert (git) [this message]
2021-05-26 17:45 ` [PULL 13/15] migration/rdma: Fix rdma_addrinfo res leaks Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 14/15] migration/rdma: destination: create the return patch after the first accept Dr. David Alan Gilbert (git)
2021-05-26 17:45 ` [PULL 15/15] migration/rdma: source: poll cm_event from return path Dr. David Alan Gilbert (git)
2021-05-27 15:32 ` [PULL 00/15] migration/virtiofs/hmp queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210526174540.290588-13-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lizhijian@cn.fujitsu.com \
    --cc=ma.mandourr@gmail.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=vgoyal@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).