From 27928b179243d4d09c6000a2397bcf8d7de7a804 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 20 Mar 2013 15:44:26 +1030 Subject: [PATCH] --- yaml --- r: 370938 b: refs/heads/master c: e538ebaf78455ff87dec2c34d4f9c128844e3f3f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/virtio/linux/virtio.h | 10 ++++++++++ trunk/tools/virtio/vringh_test.c | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 418b832203c1..0458327c1b38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 282edb36499042a92b71f052f51754ae7ed936e4 +refs/heads/master: e538ebaf78455ff87dec2c34d4f9c128844e3f3f diff --git a/trunk/tools/virtio/linux/virtio.h b/trunk/tools/virtio/linux/virtio.h index 5fa612ad932c..6df181a6bcc6 100644 --- a/trunk/tools/virtio/linux/virtio.h +++ b/trunk/tools/virtio/linux/virtio.h @@ -63,6 +63,16 @@ int virtqueue_add_sgs(struct virtqueue *vq, void *data, gfp_t gfp); +int virtqueue_add_outbuf(struct virtqueue *vq, + struct scatterlist sg[], unsigned int num, + void *data, + gfp_t gfp); + +int virtqueue_add_inbuf(struct virtqueue *vq, + struct scatterlist sg[], unsigned int num, + void *data, + gfp_t gfp); + void virtqueue_kick(struct virtqueue *vq); void *virtqueue_get_buf(struct virtqueue *vq, unsigned int *len); diff --git a/trunk/tools/virtio/vringh_test.c b/trunk/tools/virtio/vringh_test.c index 6a48ca5c101f..bb0bd9403e9e 100644 --- a/trunk/tools/virtio/vringh_test.c +++ b/trunk/tools/virtio/vringh_test.c @@ -369,11 +369,11 @@ static int parallel_test(unsigned long features, * user addr */ __kmalloc_fake = indirects + (xfers % RINGSIZE) * 4; if (output) - err = virtqueue_add_buf(vq, sg, num_sg, 0, dbuf, - GFP_KERNEL); + err = virtqueue_add_outbuf(vq, sg, num_sg, dbuf, + GFP_KERNEL); else - err = virtqueue_add_buf(vq, sg, 0, num_sg, dbuf, - GFP_KERNEL); + err = virtqueue_add_inbuf(vq, sg, num_sg, + dbuf, GFP_KERNEL); if (err == -ENOSPC) { if (!virtqueue_enable_cb_delayed(vq))