summaryrefslogtreecommitdiffstats
path: root/drivers/vhost/vhost.h
diff options
context:
space:
mode:
authorAsias He <asias@redhat.com>2013-04-27 15:07:46 +0800
committerMichael S. Tsirkin <mst@redhat.com>2013-05-01 10:02:52 +0300
commit2839400f8fe28ce216eeeba3fb97bdf90977f7ad (patch)
treedf1d7dd849aed638e3992f43e0035541ce485692 /drivers/vhost/vhost.h
parentf2f0173d6a95fa60e7934f62ce27d6bd24e4e09c (diff)
downloadlinux-2839400f8fe28ce216eeeba3fb97bdf90977f7ad.tar.gz
linux-2839400f8fe28ce216eeeba3fb97bdf90977f7ad.tar.bz2
linux-2839400f8fe28ce216eeeba3fb97bdf90977f7ad.zip
vhost: move vhost-net zerocopy fields to net.c
On top of 'vhost: Allow device specific fields per vq', we can move device specific fields to device virt queue from vhost virt queue. Signed-off-by: Asias He <asias@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost/vhost.h')
-rw-r--r--drivers/vhost/vhost.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index f3afa8a41fe0..3a36712e0792 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -54,18 +54,6 @@ struct vhost_log {
struct vhost_virtqueue;
-struct vhost_ubuf_ref {
- struct kref kref;
- wait_queue_head_t wait;
- struct vhost_virtqueue *vq;
-};
-
-struct vhost_ubuf_ref *vhost_ubuf_alloc(struct vhost_virtqueue *, bool zcopy);
-void vhost_ubuf_put(struct vhost_ubuf_ref *);
-void vhost_ubuf_put_and_wait(struct vhost_ubuf_ref *);
-
-struct ubuf_info;
-
/* The virtqueue structure describes a queue attached to a device. */
struct vhost_virtqueue {
struct vhost_dev *dev;
@@ -130,16 +118,6 @@ struct vhost_virtqueue {
/* Log write descriptors */
void __user *log_base;
struct vhost_log *log;
- /* vhost zerocopy support fields below: */
- /* last used idx for outstanding DMA zerocopy buffers */
- int upend_idx;
- /* first used idx for DMA done zerocopy buffers */
- int done_idx;
- /* an array of userspace buffers info */
- struct ubuf_info *ubuf_info;
- /* Reference counting for outstanding ubufs.
- * Protected by vq mutex. Writers must also take device mutex. */
- struct vhost_ubuf_ref *ubufs;
};
struct vhost_dev {