[PATCH V2 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init()

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, Stefano Garzarella <sgarzare@redhat.com>
Subject: [PATCH V2 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init()
Date: Tue,  6 Jul 2021 16:27:07 +0800	[thread overview]
Message-ID: <20210706082717.37730-9-jasowang@redhat.com> (raw)
In-Reply-To: <20210706082717.37730-1-jasowang@redhat.com>

Vhost_vdpa_add() can fail for various reasons, so the assertion of the
succeed is wrong. Instead, we should free the NetClientState and
propagate the error to the caller

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/vhost-vdpa.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 0da7bc347a..87b181a74e 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -174,7 +174,10 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
     }
     s->vhost_vdpa.device_fd = vdpa_device_fd;
     ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
-    assert(s->vhost_net);
+    if (ret) {
+        qemu_close(vdpa_device_fd);
+        qemu_del_net_client(nc);
+    }
     return ret;
 }
 
-- 
2.25.1


