OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vhost-vdpa: open device fd in net_init_vhost_vdpa()

Browse Source 
This patch switches to open device fd in net_init_vhost_vpda(). This is
used to prepare for the multiqueue support.

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20211020045600.16082-2-jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jason Wang 2021-10-20 12:55:51 +08:00 committed by Michael S. Tsirkin
parent 81d7228647
commit 7327813d17
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/vhost-vdpa.c
View File

@ -170,24 +170,19 @@ static NetClientInfo net_vhost_vdpa_info = {
}; };
static int net_vhost_vdpa_init(NetClientState *peer, const char *device, static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
const char *name, const char *vhostdev) const char *name, int vdpa_device_fd)
{ {
NetClientState *nc = NULL; NetClientState *nc = NULL;
VhostVDPAState *s; VhostVDPAState *s;
int vdpa_device_fd = -1;
int ret = 0; int ret = 0;
assert(name); assert(name);
nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name);
snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA); snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
s = DO_UPCAST(VhostVDPAState, nc, nc); s = DO_UPCAST(VhostVDPAState, nc, nc);
vdpa_device_fd = qemu_open_old(vhostdev, O_RDWR);
if (vdpa_device_fd == -1) {
return -errno;
}
s->vhost_vdpa.device_fd = vdpa_device_fd; s->vhost_vdpa.device_fd = vdpa_device_fd;
ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa); ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
if (ret) { if (ret) {
qemu_close(vdpa_device_fd);
qemu_del_net_client(nc); qemu_del_net_client(nc);
} }
return ret; return ret;
@ -197,8 +192,20 @@ 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;
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;
return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev);
vdpa_device_fd = qemu_open_old(opts->vhostdev, O_RDWR);
if (vdpa_device_fd == -1) {
return -errno;
}
ret = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, vdpa_device_fd);
if (ret) {
qemu_close(vdpa_device_fd);
}
return ret;
} }