d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: move cuse only struct to cuse

Browse Source 
vhost cuse is now the last reference of the vhost_device_ctx struct;
move it there, and do a rename to "vhost_cuse_device_ctx", to make
it clear that it's "cuse only".

Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Tested-by: Rich Lane <rich.lane@bigswitch.com>
Acked-by: Rich Lane <rich.lane@bigswitch.com>
This commit is contained in:
Yuanhan Liu 2016-04-30 07:38:19 +08:00
parent 319d362e3b
commit adf97191b3
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/librte_vhost/vhost-net.h
View File

@ -75,14 +75,6 @@
#endif
/*
* Structure used to identify device context.
*/
struct vhost_device_ctx {
pid_t pid; /* PID of process calling the IOCTL. */
int vid; /* Virtio-net device ID */
};
int vhost_new_device(void);
void vhost_destroy_device(int);

13
lib/librte_vhost/vhost_cuse/vhost-net-cdev.c
View File

@ -60,13 +60,14 @@ static const char default_cdev[] = "vhost-net";
static struct fuse_session *session;
/*
* Returns vhost_device_ctx from given fuse_req_t. The index is populated later
* when the device is added to the device linked list.
* Returns vhost_cuse_device_ctx from given fuse_req_t. The
* index is populated later when the device is added to the
* device linked list.
*/
static struct vhost_device_ctx
static struct vhost_cuse_device_ctx
fuse_req_to_vhost_ctx(fuse_req_t req, struct fuse_file_info *fi)
{
struct vhost_device_ctx ctx;
struct vhost_cuse_device_ctx ctx;
struct fuse_ctx const *const req_ctx = fuse_req_ctx(req);
ctx.pid = req_ctx->pid;
@ -104,7 +105,7 @@ static void
vhost_net_release(fuse_req_t req, struct fuse_file_info *fi)
{
int err = 0;
struct vhost_device_ctx ctx = fuse_req_to_vhost_ctx(req, fi);
struct vhost_cuse_device_ctx ctx = fuse_req_to_vhost_ctx(req, fi);
vhost_destroy_device(ctx.vid);
RTE_LOG(INFO, VHOST_CONFIG, "(%d) device released\n", ctx.vid);
@ -182,7 +183,7 @@ vhost_net_ioctl(fuse_req_t req, int cmd, void *arg,
struct fuse_file_info *fi, __rte_unused unsigned flags,
const void *in_buf, size_t in_bufsz, size_t out_bufsz)
{
struct vhost_device_ctx ctx = fuse_req_to_vhost_ctx(req, fi);
struct vhost_cuse_device_ctx ctx = fuse_req_to_vhost_ctx(req, fi);
struct vhost_vring_file file;
struct vhost_vring_state state;
struct vhost_vring_addr addr;

6
lib/librte_vhost/vhost_cuse/virtio-net-cdev.c
View File

@ -263,7 +263,7 @@ host_memory_map(pid_t pid, uint64_t addr,
}
int
cuse_set_mem_table(struct vhost_device_ctx ctx,
cuse_set_mem_table(struct vhost_cuse_device_ctx ctx,
const struct vhost_memory *mem_regions_addr, uint32_t nregions)
{
uint64_t size = offsetof(struct vhost_memory, regions);
@ -405,7 +405,9 @@ get_ifname(int vid, int tap_fd, int pid)
return 0;
}
int cuse_set_backend(struct vhost_device_ctx ctx, struct vhost_vring_file *file)
int
cuse_set_backend(struct vhost_cuse_device_ctx ctx,
struct vhost_vring_file *file)
{
struct virtio_net *dev;

12
lib/librte_vhost/vhost_cuse/virtio-net-cdev.h
View File

@ -38,11 +38,19 @@
#include "vhost-net.h"
/*
* Structure used to identify device context.
*/
struct vhost_cuse_device_ctx {
pid_t pid; /* PID of process calling the IOCTL. */
int vid; /* Virtio-net device ID */
};
int
cuse_set_mem_table(struct vhost_device_ctx ctx,
cuse_set_mem_table(struct vhost_cuse_device_ctx ctx,
const struct vhost_memory *mem_regions_addr, uint32_t nregions);
int
cuse_set_backend(struct vhost_device_ctx ctx, struct vhost_vring_file *);
cuse_set_backend(struct vhost_cuse_device_ctx ctx, struct vhost_vring_file *);
#endif