diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2020-04-01 12:46:22 -0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2020-04-16 18:31:08 -0400 |
commit | 3302363a27fb38a3581921a74aff855f4dcbfe0a (patch) | |
tree | 5facda6624c9bf93dee6434c89dc3352e89e0d96 /drivers/vhost/test.c | |
parent | 247643f85782fc1119ccbd712a5075535ebf9d43 (diff) | |
download | linux-stable-3302363a27fb38a3581921a74aff855f4dcbfe0a.tar.gz linux-stable-3302363a27fb38a3581921a74aff855f4dcbfe0a.tar.bz2 linux-stable-3302363a27fb38a3581921a74aff855f4dcbfe0a.zip |
virtio/test: fix up after IOTLB changes
Allow building vringh without IOTLB (that's the case for userspace
builds, will be useful for CAIF/VOD down the road too).
Update for API tweaks.
Don't include vringh with userspace builds.
Cc: Jason Wang <jasowang@redhat.com>
Cc: Eugenio PĂ©rez <eperezma@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'drivers/vhost/test.c')
-rw-r--r-- | drivers/vhost/test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c index 394e2e5c772d..9a3a09005e03 100644 --- a/drivers/vhost/test.c +++ b/drivers/vhost/test.c @@ -120,7 +120,7 @@ static int vhost_test_open(struct inode *inode, struct file *f) vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ]; n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick; vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, UIO_MAXIOV, - VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT); + VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT, NULL); f->private_data = n; @@ -225,7 +225,7 @@ static long vhost_test_reset_owner(struct vhost_test *n) { void *priv = NULL; long err; - struct vhost_umem *umem; + struct vhost_iotlb *umem; mutex_lock(&n->dev.mutex); err = vhost_dev_check_owner(&n->dev); |