haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <jasowang@redhat.com>
Message-Id: <20211020045600.16082-5-jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
staging
Jason Wang 2021-10-20 12:55:54 +08:00 committed by Michael S. Tsirkin
parent 353244d8b9
commit 654790b65b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/vhost-vdpa.c
View File

@ -169,8 +169,10 @@ static NetClientInfo net_vhost_vdpa_info = {
.check_peer_type = vhost_vdpa_check_peer_type, .check_peer_type = vhost_vdpa_check_peer_type,
}; };
static int net_vhost_vdpa_init(NetClientState *peer, const char *device, static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
const char *name, int vdpa_device_fd) const char *device,
const char *name,
int vdpa_device_fd)
{ {
NetClientState *nc = NULL; NetClientState *nc = NULL;
VhostVDPAState *s; 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); ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
if (ret) { if (ret) {
qemu_del_net_client(nc); qemu_del_net_client(nc);
return NULL;
} }
return ret; return nc;
} }
int net_init_vhost_vdpa(const Netdev *netdev, const char *name, int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp) NetClientState *peer, Error **errp)
{ {
const NetdevVhostVDPAOptions *opts; const NetdevVhostVDPAOptions *opts;
int vdpa_device_fd, ret; int vdpa_device_fd;
NetClientState *nc;
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA); assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
opts = &netdev->u.vhost_vdpa; opts = &netdev->u.vhost_vdpa;
@ -202,10 +206,11 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
return -errno; return -errno;
} }
ret = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, vdpa_device_fd); nc = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, vdpa_device_fd);
if (ret) { if (!nc) {
qemu_close(vdpa_device_fd); qemu_close(vdpa_device_fd);
return -1;
} }
return ret; return 0;
} }