Commit 0d234007 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

vhost/vdpa: switch to new helpers 



For new helpers handling legacy features to be effective,
vhost needs to invoke them. Tie them in.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 452639a6

drivers/vhost/vdpa.c

+3 −5
Original line number Diff line number Diff line
@@ -118,9 +118,8 @@ static irqreturn_t vhost_vdpa_config_cb(void *private) 
static void vhost_vdpa_reset(struct vhost_vdpa *v)

{

	struct vdpa_device *vdpa = v->vdpa;

	const struct vdpa_config_ops *ops = vdpa->config;



	ops->set_status(vdpa, 0);

	vdpa_reset(vdpa);

}



static long vhost_vdpa_get_device_id(struct vhost_vdpa *v, u8 __user *argp)
@@ -196,7 +195,6 @@ static long vhost_vdpa_get_config(struct vhost_vdpa *v, 
				  struct vhost_vdpa_config __user *c)

{

	struct vdpa_device *vdpa = v->vdpa;

	const struct vdpa_config_ops *ops = vdpa->config;

	struct vhost_vdpa_config config;

	unsigned long size = offsetof(struct vhost_vdpa_config, buf);

	u8 *buf;
@@ -209,7 +207,7 @@ static long vhost_vdpa_get_config(struct vhost_vdpa *v, 
	if (!buf)

		return -ENOMEM;



	ops->get_config(vdpa, config.off, buf, config.len);

	vdpa_get_config(vdpa, config.off, buf, config.len);



	if (copy_to_user(c->buf, buf, config.len)) {

		kvfree(buf);
@@ -282,7 +280,7 @@ static long vhost_vdpa_set_features(struct vhost_vdpa *v, u64 __user *featurep) 
	if (features & ~vhost_vdpa_features[v->virtio_id])

		return -EINVAL;



	if (ops->set_features(vdpa, features))

	if (vdpa_set_features(vdpa, features))

		return -EINVAL;



	return 0;