aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2013-03-18 13:22:18 +1030
committerRusty Russell <rusty@rustcorp.com.au>2013-03-20 14:00:41 +1030
commit73640c991e2f2804939af70567b23e4c54b7c266 (patch)
tree40800f0b2ddd54ef17160879bada9d1e16a4ce01 /drivers/vhost
parent29266e2e29f1f87b93321e56812f9fb16f91cb6d (diff)
downloadkernel_goldelico_gta04-73640c991e2f2804939af70567b23e4c54b7c266.zip
kernel_goldelico_gta04-73640c991e2f2804939af70567b23e4c54b7c266.tar.gz
kernel_goldelico_gta04-73640c991e2f2804939af70567b23e4c54b7c266.tar.bz2
tools/virtio: fix build for 3.8
Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/vhost')
-rw-r--r--drivers/vhost/test.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 91d6f06..329d302 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -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;