[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init()
From: |
Jason Wang |
Subject: |
[PATCH 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init() |
Date: |
Mon, 21 Jun 2021 12:16:40 +0800 |
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
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
- [PATCH 03/18] vhost_net: do not assume nvqs is always 2, (continued)
- [PATCH 03/18] vhost_net: do not assume nvqs is always 2, Jason Wang, 2021/06/21
- [PATCH 04/18] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add(), Jason Wang, 2021/06/21
- [PATCH 05/18] vhost-vdpa: don't cleanup twice in vhost_vdpa_add(), Jason Wang, 2021/06/21
- [PATCH 06/18] vhost-vdpa: fix leaking of vhost_net in vhost_vdpa_add(), Jason Wang, 2021/06/21
- [PATCH 07/18] vhost-vdpa: tweak the error label in vhost_vdpa_add(), Jason Wang, 2021/06/21
- [PATCH 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init(),
Jason Wang <=
- [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
- [PATCH 14/18] net: introduce control client, Jason Wang, 2021/06/21
- [PATCH 15/18] vhost-net: control virtqueue support, Jason Wang, 2021/06/21