[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/57] vhost-vdpa: open device fd in net_init_vhost_vdpa()
From: |
Michael S. Tsirkin |
Subject: |
[PULL 03/57] vhost-vdpa: open device fd in net_init_vhost_vdpa() |
Date: |
Tue, 5 Oct 2021 12:00:52 -0400 |
From: Jason Wang <jasowang@redhat.com>
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: <20210907090322.1756-2-jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
net/vhost-vdpa.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 912686457c..73d29a74ef 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -156,24 +156,19 @@ static NetClientInfo net_vhost_vdpa_info = {
};
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;
VhostVDPAState *s;
- int vdpa_device_fd = -1;
int ret = 0;
assert(name);
nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name);
snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
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;
ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
if (ret) {
- qemu_close(vdpa_device_fd);
qemu_del_net_client(nc);
}
return ret;
@@ -201,6 +196,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
NetClientState *peer, Error **errp)
{
const NetdevVhostVDPAOptions *opts;
+ int vdpa_device_fd, ret;
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
opts = &netdev->u.vhost_vdpa;
@@ -209,5 +205,16 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
(char *)name, errp)) {
return -1;
}
- 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;
}
--
MST
- [PULL 00/57] pc,pci,virtio: features, fixes, Michael S. Tsirkin, 2021/10/05
- [PULL 04/57] vhost-vdpa: classify one time request, Michael S. Tsirkin, 2021/10/05
- [PULL 05/57] vhost-vdpa: prepare for the multiqueue support, Michael S. Tsirkin, 2021/10/05
- [PULL 03/57] vhost-vdpa: open device fd in net_init_vhost_vdpa(),
Michael S. Tsirkin <=
- [PULL 02/57] hw/virtio: Have virtqueue_get_avail_bytes() pass caches arg to callees, Michael S. Tsirkin, 2021/10/05
- [PULL 07/57] net: introduce control client, Michael S. Tsirkin, 2021/10/05
- [PULL 08/57] vhost-net: control virtqueue support, Michael S. Tsirkin, 2021/10/05
- [PULL 12/57] vhost-vdpa: multiqueue support, Michael S. Tsirkin, 2021/10/05
- [PULL 11/57] virtio-net: vhost control virtqueue support, Michael S. Tsirkin, 2021/10/05
- [PULL 09/57] virtio-net: use "queue_pairs" instead of "queues" when possible, Michael S. Tsirkin, 2021/10/05
- [PULL 10/57] vhost: record the last virtqueue index for the virtio device, Michael S. Tsirkin, 2021/10/05
- [PULL 14/57] vhost-vsock: handle common features in vhost-vsock-common, Michael S. Tsirkin, 2021/10/05
- [PULL 16/57] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header(), Michael S. Tsirkin, 2021/10/05
- [PULL 13/57] vhost-vsock: fix migration issue when seqpacket is supported, Michael S. Tsirkin, 2021/10/05