> -----Original Message-----
> From: Qemu-devel <qemu-devel-
> [email protected]> On Behalf Of Jason Wang
> Sent: Tuesday, September 7, 2021 5:03 PM
> To: [email protected]; [email protected]; [email protected]
> Cc: [email protected]; [email protected]; [email protected]; Zhu,
> Lingshan <[email protected]>; [email protected]
> Subject: [PATCH V3 04/10] vhost-vdpa: let net_vhost_vdpa_init() returns
> NetClientState *
>
> 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 <[email protected]>
> ---
> 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
> 73d29a74ef..834dab28dd 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -155,8 +155,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;
> @@ -170,8 +172,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) @@ -196,7 +199,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;
> @@ -211,10 +215,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;
It looks like this patch needs to be merged with the 01/10 patch.
Both related to the changes of " net_vhost_vdpa_init ".
Thanks
Chen
> }
>
> - return ret;
> + return 0;
> }
> --
> 2.25.1
>
