[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V5 04/10] vhost-vdpa: let net_vhost_vdpa_init() returns NetClient
From: |
Jason Wang |
Subject: |
[PATCH V5 04/10] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState * |
Date: |
Wed, 20 Oct 2021 12:55:54 +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 fd4ff5a0fb..151f60184d 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -169,8 +169,10 @@ static NetClientInfo net_vhost_vdpa_info = {
.check_peer_type = vhost_vdpa_check_peer_type,
};
-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;
@@ -184,15 +186,17 @@ 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;
}
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;
@@ -202,10 +206,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 V5 00/10] vhost-vDPA multiqueue, Jason Wang, 2021/10/20
- [PATCH V5 01/10] vhost-vdpa: open device fd in net_init_vhost_vdpa(), Jason Wang, 2021/10/20
- [PATCH V5 02/10] vhost-vdpa: classify one time request, Jason Wang, 2021/10/20
- [PATCH V5 03/10] vhost-vdpa: prepare for the multiqueue support, Jason Wang, 2021/10/20
- [PATCH V5 04/10] vhost-vdpa: let net_vhost_vdpa_init() returns NetClientState *,
Jason Wang <=
- [PATCH V5 05/10] net: introduce control client, Jason Wang, 2021/10/20
- [PATCH V5 06/10] vhost-net: control virtqueue support, Jason Wang, 2021/10/20
- [PATCH V5 07/10] virtio-net: use "queue_pairs" instead of "queues" when possible, Jason Wang, 2021/10/20
- [PATCH V5 08/10] vhost: record the last virtqueue index for the virtio device, Jason Wang, 2021/10/20
- [PATCH V5 09/10] virtio-net: vhost control virtqueue support, Jason Wang, 2021/10/20
- [PATCH V5 10/10] vhost-vdpa: multiqueue support, Jason Wang, 2021/10/20