[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V2 13/18] vhost-vdpa: let net_vhost_vdpa_init() returns NetClient
From: |
Jason Wang |
Subject: |
[PATCH V2 13/18] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState * |
Date: |
Tue, 6 Jul 2021 16:27:12 +0800 |
This patch switches to let net_vhost_vdpa_init() to return
NetClientState *. This is used for the callers to allocate multiqueue
NetClientState for multiqueue support.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/vhost-vdpa.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index e63a54a938..cc11b2ec40 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -156,8 +156,10 @@ static NetClientInfo net_vhost_vdpa_info = {
.has_ufo = vhost_vdpa_has_ufo,
};
-static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
- const char *name, int vdpa_device_fd)
+static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
+ const char *device,
+ const char *name,
+ int vdpa_device_fd)
{
NetClientState *nc = NULL;
VhostVDPAState *s;
@@ -171,8 +173,9 @@ static int net_vhost_vdpa_init(NetClientState *peer, const
char *device,
ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
if (ret) {
qemu_del_net_client(nc);
+ return NULL;
}
- return ret;
+ return nc;
}
static int net_vhost_check_net(void *opaque, QemuOpts *opts, Error **errp)
@@ -197,7 +200,8 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
NetClientState *peer, Error **errp)
{
const NetdevVhostVDPAOptions *opts;
- int vdpa_device_fd, ret;
+ int vdpa_device_fd;
+ NetClientState *nc;
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
opts = &netdev->u.vhost_vdpa;
@@ -212,10 +216,11 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
return -errno;
}
- ret = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, vdpa_device_fd);
- if (ret) {
+ nc = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, vdpa_device_fd);
+ if (!nc) {
qemu_close(vdpa_device_fd);
+ return -1;
}
- return ret;
+ return 0;
}
--
2.25.1
- [PATCH V2 02/18] vhost: use unsigned int for nvqs, (continued)
- [PATCH V2 02/18] vhost: use unsigned int for nvqs, Jason Wang, 2021/07/06
- [PATCH V2 03/18] vhost_net: do not assume nvqs is always 2, Jason Wang, 2021/07/06
- [PATCH V2 04/18] vhost-vdpa: remove the unnecessary check in vhost_vdpa_add(), Jason Wang, 2021/07/06
- [PATCH V2 06/18] vhost-vdpa: fix leaking of vhost_net in vhost_vdpa_add(), Jason Wang, 2021/07/06
- [PATCH V2 05/18] vhost-vdpa: don't cleanup twice in vhost_vdpa_add(), Jason Wang, 2021/07/06
- [PATCH V2 07/18] vhost-vdpa: tweak the error label in vhost_vdpa_add(), Jason Wang, 2021/07/06
- [PATCH V2 08/18] vhost-vdpa: fix the wrong assertion in vhost_vdpa_init(), Jason Wang, 2021/07/06
- [PATCH V2 09/18] vhost-vdpa: remove the unncessary queue_index assignment, Jason Wang, 2021/07/06
- [PATCH V2 10/18] vhost-vdpa: open device fd in net_init_vhost_vdpa(), Jason Wang, 2021/07/06
- [PATCH V2 11/18] vhost-vdpa: classify one time request, Jason Wang, 2021/07/06
- [PATCH V2 13/18] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState *,
Jason Wang <=
- [PATCH V2 14/18] net: introduce control client, Jason Wang, 2021/07/06
- [PATCH V2 12/18] vhost-vdpa: prepare for the multiqueue support, Jason Wang, 2021/07/06
- [PATCH V2 15/18] vhost-net: control virtqueue support, Jason Wang, 2021/07/06
- [PATCH V2 16/18] virito-net: use "qps" instead of "queues" when possible, Jason Wang, 2021/07/06
- [PATCH V2 17/18] virtio-net: vhost control virtqueue support, Jason Wang, 2021/07/06
- [PATCH V2 18/18] vhost-vdpa: multiqueue support, Jason Wang, 2021/07/06
- Re: [PATCH V2 00/18] vhost-vDPA multiqueue, Jason Wang, 2021/07/12
- Re: [PATCH V2 00/18] vhost-vDPA multiqueue, Jason Wang, 2021/07/15