lkml.org 
[lkml]   [2020]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v3 20/38] 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: Michael S. Tsirkin <mst@redhat.com>
    ---
    drivers/vhost/vdpa.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
    index 18869a35d408..3674404688f5 100644
    --- a/drivers/vhost/vdpa.c
    +++ b/drivers/vhost/vdpa.c
    @@ -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;
    --
    MST
    \
     
     \ /
      Last update: 2020-08-05 21:27    [W:4.154 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site