[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/18] vhost-vdpa: tweak the error label in vhost_vdpa_add()
From: |
Jason Wang |
Subject: |
[PATCH 07/18] vhost-vdpa: tweak the error label in vhost_vdpa_add() |
Date: |
Mon, 21 Jun 2021 12:16:39 +0800 |
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
- Re: [PATCH 04/18] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add(), (continued)
[PATCH 07/18] vhost-vdpa: tweak the error label in vhost_vdpa_add(),
Jason Wang <=
[PATCH 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init(), Jason Wang, 2021/06/21
[PATCH 09/18] vhost-vdpa: remove the unncessary queue_index assignment, Jason Wang, 2021/06/21
[PATCH 10/18] vhost-vdpa: open device fd in net_init_vhost_vdpa(), Jason Wang, 2021/06/21
[PATCH 11/18] vhost-vdpa: classify one time request, Jason Wang, 2021/06/21
[PATCH 12/18] vhost-vdpa: prepare for the multiqueue support, Jason Wang, 2021/06/21
[PATCH 13/18] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState *, Jason Wang, 2021/06/21