qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, mst@redhat.com, jasowang@redhat.com
Cc: eperezma@redhat.com, elic@nvidia.com, lingshan.zhu@intel.com,
	lulu@redhat.com
Subject: [PATCH V2 07/18] vhost-vdpa: tweak the error label in vhost_vdpa_add()
Date: Tue,  6 Jul 2021 16:27:06 +0800	[thread overview]
Message-ID: <20210706082717.37730-8-jasowang@redhat.com> (raw)
In-Reply-To: <20210706082717.37730-1-jasowang@redhat.com>

Introduce new error label to avoid the unnecessary checking of net
pointer.

Fixes: 1e0a84ea49b68 ("vhost-vdpa: introduce vhost-vdpa net client")
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/vhost-vdpa.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 21f09c546f..0da7bc347a 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -100,19 +100,18 @@ static int vhost_vdpa_add(NetClientState *ncs, void *be)
     net = vhost_net_init(&options);
     if (!net) {
         error_report("failed to init vhost_net for queue");
-        goto err;
+        goto err_init;
     }
     s->vhost_net = net;
     ret = vhost_vdpa_net_check_device_id(net);
     if (ret) {
-        goto err;
+        goto err_check;
     }
     return 0;
-err:
-    if (net) {
-        vhost_net_cleanup(net);
-        g_free(net);
-    }
+err_check:
+    vhost_net_cleanup(net);
+    g_free(net);
+err_init:
     return -1;
 }
 
-- 
2.25.1



  parent reply	other threads:[~2021-07-06  8:35 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-06  8:26 [PATCH V2 00/18] vhost-vDPA multiqueue Jason Wang
2021-07-06  8:27 ` [PATCH V2 01/18] vhost_net: remove the meaningless assignment in vhost_net_start_one() Jason Wang
2021-07-06  8:27 ` [PATCH V2 02/18] vhost: use unsigned int for nvqs Jason Wang
2021-07-06  8:27 ` [PATCH V2 03/18] vhost_net: do not assume nvqs is always 2 Jason Wang
2021-07-06  8:27 ` [PATCH V2 04/18] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add() Jason Wang
2021-07-06  8:27 ` [PATCH V2 05/18] vhost-vdpa: don't cleanup twice " Jason Wang
2021-07-06  8:27 ` [PATCH V2 06/18] vhost-vdpa: fix leaking of vhost_net " Jason Wang
2021-07-06  8:27 ` Jason Wang [this message]
2021-07-06  8:27 ` [PATCH V2 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init() Jason Wang
2021-07-06  8:27 ` [PATCH V2 09/18] vhost-vdpa: remove the unncessary queue_index assignment Jason Wang
2021-07-06  8:27 ` [PATCH V2 10/18] vhost-vdpa: open device fd in net_init_vhost_vdpa() Jason Wang
2021-07-06  8:27 ` [PATCH V2 11/18] vhost-vdpa: classify one time request Jason Wang
2021-07-06  8:27 ` [PATCH V2 12/18] vhost-vdpa: prepare for the multiqueue support Jason Wang
2021-07-06  8:27 ` [PATCH V2 13/18] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState * Jason Wang
2021-07-06  8:27 ` [PATCH V2 14/18] net: introduce control client Jason Wang
2021-07-06  8:27 ` [PATCH V2 15/18] vhost-net: control virtqueue support Jason Wang
2021-07-06  8:27 ` [PATCH V2 16/18] virito-net: use "qps" instead of "queues" when possible Jason Wang
2021-07-06  8:27 ` [PATCH V2 17/18] virtio-net: vhost control virtqueue support Jason Wang
2021-07-06  8:27 ` [PATCH V2 18/18] vhost-vdpa: multiqueue support Jason Wang
2021-07-12  5:44 ` [PATCH V2 00/18] vhost-vDPA multiqueue Jason Wang
2021-07-12 13:15   ` Michael S. Tsirkin
     [not found]     ` <CACGkMEs_sNOqdsDvpMR+Mx7TXY2wW8p_NVALvHLPgeAsiWNTGA@mail.gmail.com>
     [not found]       ` <20210713114825-mutt-send-email-mst@kernel.org>
2021-07-14  2:00         ` Jason Wang
2021-07-15  4:24   ` Jason Wang

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=20210706082717.37730-8-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=elic@nvidia.com \
    --cc=eperezma@redhat.com \
    --cc=lingshan.zhu@intel.com \
    --cc=lulu@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).