[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V2 09/21] vhost-vdpa: tweak the error label in vhost_vdpa_add()
From: |
Jason Wang |
Subject: |
[PATCH V2 09/21] vhost-vdpa: tweak the error label in vhost_vdpa_add() |
Date: |
Fri, 3 Sep 2021 17:10:19 +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 b43df00a85..99327d17b4 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -99,19 +99,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
- [PATCH V2 00/21] vhost-vDPA multiqueue, Jason Wang, 2021/09/03
- [PATCH V2 01/21] vhost-vdpa: remove unused variable "acked_features", Jason Wang, 2021/09/03
- [PATCH V2 02/21] vhost-vdpa: correctly return err in vhost_vdpa_set_backend_cap(), Jason Wang, 2021/09/03
- [PATCH V2 03/21] vhost_net: remove the meaningless assignment in vhost_net_start_one(), Jason Wang, 2021/09/03
- [PATCH V2 04/21] vhost: use unsigned int for nvqs, Jason Wang, 2021/09/03
- [PATCH V2 05/21] vhost_net: do not assume nvqs is always 2, Jason Wang, 2021/09/03
- [PATCH V2 06/21] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add(), Jason Wang, 2021/09/03
- [PATCH V2 07/21] vhost-vdpa: don't cleanup twice in vhost_vdpa_add(), Jason Wang, 2021/09/03
- [PATCH V2 08/21] vhost-vdpa: fix leaking of vhost_net in vhost_vdpa_add(), Jason Wang, 2021/09/03
- [PATCH V2 09/21] vhost-vdpa: tweak the error label in vhost_vdpa_add(),
Jason Wang <=
- [PATCH V2 10/21] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init(), Jason Wang, 2021/09/03
- [PATCH V2 11/21] vhost-vdpa: remove the unncessary queue_index assignment, Jason Wang, 2021/09/03
- [PATCH V2 12/21] vhost-vdpa: open device fd in net_init_vhost_vdpa(), Jason Wang, 2021/09/03
- [PATCH V2 13/21] vhost-vdpa: classify one time request, Jason Wang, 2021/09/03
- [PATCH V2 14/21] vhost-vdpa: prepare for the multiqueue support, Jason Wang, 2021/09/03
- [PATCH V2 15/21] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState *, Jason Wang, 2021/09/03
- [PATCH V2 16/21] net: introduce control client, Jason Wang, 2021/09/03
- [PATCH V2 17/21] vhost-net: control virtqueue support, Jason Wang, 2021/09/03