Browse Source

vhost-user: delete net client if necessary

As qemu_new_net_client create new ncs but error happens later,
ncs will be left in global net_clients list and we can't use them any
more, so we need to cleanup them.

Cc: qemu-stable@nongnu.org
Signed-off-by: linzhecheng <linzhecheng@huawei.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
(cherry picked from commit c67daf4a24442d1bb404a11a6a54dc45ea10f234)
 Conflicts:
	net/vhost-user.c
* drop functional dep on 4d0cf552
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
linzhecheng 7 years ago
parent
commit
d8a919ffc7
1 changed files with 9 additions and 2 deletions
  1. 9 2
      net/vhost-user.c

+ 9 - 2
net/vhost-user.c

@@ -296,7 +296,7 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
             s = DO_UPCAST(VhostUserState, nc, nc);
             s = DO_UPCAST(VhostUserState, nc, nc);
             if (!qemu_chr_fe_init(&s->chr, chr, &err)) {
             if (!qemu_chr_fe_init(&s->chr, chr, &err)) {
                 error_report_err(err);
                 error_report_err(err);
-                return -1;
+                goto err;
             }
             }
         }
         }
 
 
@@ -306,7 +306,7 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
     do {
     do {
         if (qemu_chr_fe_wait_connected(&s->chr, &err) < 0) {
         if (qemu_chr_fe_wait_connected(&s->chr, &err) < 0) {
             error_report_err(err);
             error_report_err(err);
-            return -1;
+            goto err;
         }
         }
         qemu_chr_fe_set_handlers(&s->chr, NULL, NULL,
         qemu_chr_fe_set_handlers(&s->chr, NULL, NULL,
                                  net_vhost_user_event, NULL, nc0->name, NULL,
                                  net_vhost_user_event, NULL, nc0->name, NULL,
@@ -316,6 +316,13 @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
     assert(s->vhost_net);
     assert(s->vhost_net);
 
 
     return 0;
     return 0;
+
+err:
+    if (nc0) {
+        qemu_del_net_client(nc0);
+    }
+
+    return -1;
 }
 }
 
 
 static Chardev *net_vhost_claim_chardev(
 static Chardev *net_vhost_claim_chardev(