evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vhost: Simplify dev->vqs[i] access

Browse source 
Signed-off-by: Asias He <asias@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Asias He 2013-05-06 16:38:23 +08:00 • committed by Michael S. Tsirkin
parent c38e39c378
commit 6d5e6aa860
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/vhost/vhost.c
View file

@ -251,17 +251,16 @@ static void vhost_vq_free_iovecs(struct vhost_virtqueue *vq)
/* Helper to allocate iovec buffers for all vqs. */ /* Helper to allocate iovec buffers for all vqs. */
static long vhost_dev_alloc_iovecs(struct vhost_dev *dev) static long vhost_dev_alloc_iovecs(struct vhost_dev *dev)
{ {
struct vhost_virtqueue *vq;
int i; int i;
for (i = 0; i < dev->nvqs; ++i) { for (i = 0; i < dev->nvqs; ++i) {
dev->vqs[i]->indirect = kmalloc(sizeof *dev->vqs[i]->indirect * vq = dev->vqs[i];
UIO_MAXIOV, GFP_KERNEL); vq->indirect = kmalloc(sizeof *vq->indirect * UIO_MAXIOV,
dev->vqs[i]->log = kmalloc(sizeof *dev->vqs[i]->log * UIO_MAXIOV, GFP_KERNEL);
GFP_KERNEL); vq->log = kmalloc(sizeof *vq->log * UIO_MAXIOV, GFP_KERNEL);
dev->vqs[i]->heads = kmalloc(sizeof *dev->vqs[i]->heads * vq->heads = kmalloc(sizeof *vq->heads * UIO_MAXIOV, GFP_KERNEL);
UIO_MAXIOV, GFP_KERNEL); if (!vq->indirect || !vq->log || !vq->heads)
if (!dev->vqs[i]->indirect || !dev->vqs[i]->log ||
!dev->vqs[i]->heads)
goto err_nomem; goto err_nomem;
} }
return 0; return 0;
@ -283,6 +282,7 @@ static void vhost_dev_free_iovecs(struct vhost_dev *dev)
long vhost_dev_init(struct vhost_dev *dev, long vhost_dev_init(struct vhost_dev *dev,
struct vhost_virtqueue **vqs, int nvqs) struct vhost_virtqueue **vqs, int nvqs)
{ {
struct vhost_virtqueue *vq;
int i; int i;
dev->vqs = vqs; dev->vqs = vqs;
@ -297,15 +297,16 @@ long vhost_dev_init(struct vhost_dev *dev,
dev->worker = NULL; dev->worker = NULL;
for (i = 0; i < dev->nvqs; ++i) { for (i = 0; i < dev->nvqs; ++i) {
dev->vqs[i]->log = NULL; vq = dev->vqs[i];
dev->vqs[i]->indirect = NULL; vq->log = NULL;
dev->vqs[i]->heads = NULL; vq->indirect = NULL;
dev->vqs[i]->dev = dev; vq->heads = NULL;
mutex_init(&dev->vqs[i]->mutex); vq->dev = dev;
vhost_vq_reset(dev, dev->vqs[i]); mutex_init(&vq->mutex);
if (dev->vqs[i]->handle_kick) vhost_vq_reset(dev, vq);
vhost_poll_init(&dev->vqs[i]->poll, if (vq->handle_kick)
dev->vqs[i]->handle_kick, POLLIN, dev); vhost_poll_init(&vq->poll, vq->handle_kick,
POLLIN, dev);
} }
return 0; return 0;