[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/9] vhost-vdpa: squash net_vhost_vdpa_init() into net_init_vhost
From: |
Jason Wang |
Subject: |
[PATCH 7/9] vhost-vdpa: squash net_vhost_vdpa_init() into net_init_vhost_vdpa() |
Date: |
Mon, 31 Aug 2020 16:27:35 +0800 |
This patch squashes net_vhost_vdpa_init() into
net_init_vhost_vdpa(). This will simplify adding pre open file
descriptor support.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/vhost-vdpa.c | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 1d3ac89135..f5cc4e8326 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -172,27 +172,6 @@ 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, const char *vhostdev)
-{
- NetClientState *nc;
- VhostVDPAState *s;
- int vdpa_device_fd;
- int ret;
- assert(name);
- nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name);
- snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=%s", vhostdev);
- s = DO_UPCAST(VhostVDPAState, nc, nc);
- vdpa_device_fd = qemu_open(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);
-
- return ret;
-}
-
static int net_vhost_check_net(void *opaque, QemuOpts *opts, Error **errp)
{
const char *name = opaque;
@@ -215,6 +194,10 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
NetClientState *peer, Error **errp)
{
const NetdevVhostVDPAOptions *opts;
+ NetClientState *nc;
+ VhostVDPAState *s;
+ int vdpa_device_fd;
+ int ret;
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
opts = &netdev->u.vhost_vdpa;
@@ -227,5 +210,19 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char
*name,
error_setg(errp, "vhost-vdpa requires vhostdev to be set");
return -1;
}
- return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev);
+
+ assert(name);
+
+ nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, TYPE_VHOST_VDPA,
name);
+ snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=%s",
opts->vhostdev);
+
+ s = DO_UPCAST(VhostVDPAState, nc, nc);
+ vdpa_device_fd = qemu_open(opts->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);
+
+ return ret;
}
--
2.20.1
- [PATCH 0/9] refine vhost-vdpa initialization, Jason Wang, 2020/08/31
- [PATCH 1/9] vhost-vdpa: remove the default devname, Jason Wang, 2020/08/31
- [PATCH 2/9] vhost-vdpa: mandate vhostdev, Jason Wang, 2020/08/31
- [PATCH 3/9] vhost-vdpa: remove the unnecessary assert(s->vhost_net), Jason Wang, 2020/08/31
- [PATCH 4/9] vhost-vdpa: refine info string, Jason Wang, 2020/08/31
- [PATCH 5/9] vhost-vdpa: remove the unnecessary initialization, Jason Wang, 2020/08/31
- [PATCH 6/9] vhost-vdpa: remove the unnecessary queue index assignment, Jason Wang, 2020/08/31
- [PATCH 7/9] vhost-vdpa: squash net_vhost_vdpa_init() into net_init_vhost_vdpa(),
Jason Wang <=
- [PATCH 8/9] vhost-vdpa: add accurate error string when fail to open vhost vDPA device, Jason Wang, 2020/08/31
- [PATCH 9/9] vhost-vdpa: allow pre-opend file descriptor, Jason Wang, 2020/08/31