summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2021-09-03 17:10:19 +0800
committerMichael S. Tsirkin <mst@redhat.com>2021-09-04 17:34:05 -0400
commita97ef87a205ee957c367ebc7621bd9860ad6047d (patch)
tree70001feabd196bb4571e964ef5dbc8c865305e26
parentab36edcfeaa292ca4c49c7ebb505f122ef06f9cc (diff)
downloadfocaccia-qemu-a97ef87a205ee957c367ebc7621bd9860ad6047d.tar.gz
focaccia-qemu-a97ef87a205ee957c367ebc7621bd9860ad6047d.zip
vhost-vdpa: tweak the error label in vhost_vdpa_add()
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>
Message-Id: <20210903091031.47303-10-jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to '')
-rw-r--r--net/vhost-vdpa.c13
1 files 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;
 }