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

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
...@@ -118,9 +118,8 @@ static irqreturn_t vhost_vdpa_config_cb(void *private) ...@@ -118,9 +118,8 @@ static irqreturn_t vhost_vdpa_config_cb(void *private)
static void vhost_vdpa_reset(struct vhost_vdpa *v) static void vhost_vdpa_reset(struct vhost_vdpa *v)
{ {
struct vdpa_device *vdpa = v->vdpa; 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) 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, ...@@ -196,7 +195,6 @@ static long vhost_vdpa_get_config(struct vhost_vdpa *v,
struct vhost_vdpa_config __user *c) struct vhost_vdpa_config __user *c)
{ {
struct vdpa_device *vdpa = v->vdpa; struct vdpa_device *vdpa = v->vdpa;
const struct vdpa_config_ops *ops = vdpa->config;
struct vhost_vdpa_config config; struct vhost_vdpa_config config;
unsigned long size = offsetof(struct vhost_vdpa_config, buf); unsigned long size = offsetof(struct vhost_vdpa_config, buf);
u8 *buf; u8 *buf;
...@@ -209,7 +207,7 @@ static long vhost_vdpa_get_config(struct vhost_vdpa *v, ...@@ -209,7 +207,7 @@ static long vhost_vdpa_get_config(struct vhost_vdpa *v,
if (!buf) if (!buf)
return -ENOMEM; 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)) { if (copy_to_user(c->buf, buf, config.len)) {
kvfree(buf); kvfree(buf);
...@@ -282,7 +280,7 @@ static long vhost_vdpa_set_features(struct vhost_vdpa *v, u64 __user *featurep) ...@@ -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]) if (features & ~vhost_vdpa_features[v->virtio_id])
return -EINVAL; return -EINVAL;
if (ops->set_features(vdpa, features)) if (vdpa_set_features(vdpa, features))
return -EINVAL; return -EINVAL;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment