Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73640c99 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Rusty Russell
Browse files

tools/virtio: fix build for 3.8 



Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 29266e2e

drivers/vhost/test.c

+3 −1
Original line number Diff line number Diff line
@@ -275,7 +275,9 @@ static long vhost_test_ioctl(struct file *f, unsigned int ioctl, 
		return vhost_test_reset_owner(n);

	default:

		mutex_lock(&n->dev.mutex);

		r = vhost_dev_ioctl(&n->dev, ioctl, arg);

		r = vhost_dev_ioctl(&n->dev, ioctl, argp);

                if (r == -ENOIOCTLCMD)

                        r = vhost_vring_ioctl(&n->dev, ioctl, argp);

		vhost_test_flush(n);

		mutex_unlock(&n->dev.mutex);

		return r;

tools/virtio/Makefile

+1 −1
Original line number Diff line number Diff line 
all: test mod

test: virtio_test

virtio_test: virtio_ring.o virtio_test.o

CFLAGS += -g -O2 -Wall -I. -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow  -MMD

CFLAGS += -g -O2 -Wall -I. -I ../../usr/include/ -Wno-pointer-sign -fno-strict-overflow -fno-strict-aliasing -fno-common -MMD

vpath %.c ../../drivers/virtio

mod:

	${MAKE} -C `pwd`/../.. M=`pwd`/vhost_test

tools/virtio/linux/virtio.h

+6 −1
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ typedef __u16 u16; 
typedef enum {

	GFP_KERNEL,

	GFP_ATOMIC,

	__GFP_HIGHMEM,

	__GFP_HIGH

} gfp_t;

typedef enum {

	IRQ_NONE,
@@ -163,6 +165,8 @@ struct virtqueue { 
	void (*callback)(struct virtqueue *vq);

	const char *name;

	struct virtio_device *vdev;

        unsigned int index;

        unsigned int num_free;

	void *priv;

};
@@ -206,7 +210,8 @@ bool virtqueue_enable_cb(struct virtqueue *vq); 
bool virtqueue_enable_cb_delayed(struct virtqueue *vq);



void *virtqueue_detach_unused_buf(struct virtqueue *vq);

struct virtqueue *vring_new_virtqueue(unsigned int num,

struct virtqueue *vring_new_virtqueue(unsigned int index,

				      unsigned int num,

				      unsigned int vring_align,

				      struct virtio_device *vdev,

				      bool weak_barriers,

tools/virtio/virtio_test.c

+2 −1
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ static void vq_info_add(struct vdev_info *dev, int num) 
	assert(r >= 0);

	memset(info->ring, 0, vring_size(num, 4096));

	vring_init(&info->vring, num, info->ring, 4096);

	info->vq = vring_new_virtqueue(info->vring.num, 4096, &dev->vdev,

	info->vq = vring_new_virtqueue(info->idx,

				       info->vring.num, 4096, &dev->vdev,

				       true, info->ring,

				       vq_notify, vq_callback, "test");

	assert(info->vq);