On Tue, Mar 15, 2022 at 11:26 AM Longpeng(Mike) <[email protected]> wrote:
> From: Longpeng <[email protected]> > > Change vdpa_device.nvqs and vhost_vdpa.nvqs to use u32 > > Signed-off-by: Longpeng <[email protected]> > Acked-by: Jason Wang <[email protected]> > --- > drivers/vdpa/vdpa.c | 6 +++--- > drivers/vhost/vdpa.c | 10 ++++++---- > include/linux/vdpa.h | 6 +++--- > 3 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > index 1ea5254..2b75c00 100644 > --- a/drivers/vdpa/vdpa.c > +++ b/drivers/vdpa/vdpa.c > @@ -232,7 +232,7 @@ static int vdpa_name_match(struct device *dev, const > void *data) > return (strcmp(dev_name(&vdev->dev), data) == 0); > } > > -static int __vdpa_register_device(struct vdpa_device *vdev, int nvqs) > +static int __vdpa_register_device(struct vdpa_device *vdev, u32 nvqs) > { > struct device *dev; > > @@ -257,7 +257,7 @@ static int __vdpa_register_device(struct vdpa_device > *vdev, int nvqs) > * > * Return: Returns an error when fail to add device to vDPA bus > */ > -int _vdpa_register_device(struct vdpa_device *vdev, int nvqs) > +int _vdpa_register_device(struct vdpa_device *vdev, u32 nvqs) > { > if (!vdev->mdev) > return -EINVAL; > @@ -274,7 +274,7 @@ int _vdpa_register_device(struct vdpa_device *vdev, > int nvqs) > * > * Return: Returns an error when fail to add to vDPA bus > */ > -int vdpa_register_device(struct vdpa_device *vdev, int nvqs) > +int vdpa_register_device(struct vdpa_device *vdev, u32 nvqs) > { > int err; > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > index 605c7ae..0c82eb5 100644 > --- a/drivers/vhost/vdpa.c > +++ b/drivers/vhost/vdpa.c > @@ -42,7 +42,7 @@ struct vhost_vdpa { > struct device dev; > struct cdev cdev; > atomic_t opened; > - int nvqs; > + u32 nvqs; > int virtio_id; > int minor; > struct eventfd_ctx *config_ctx; > @@ -158,7 +158,8 @@ static long vhost_vdpa_set_status(struct vhost_vdpa > *v, u8 __user *statusp) > struct vdpa_device *vdpa = v->vdpa; > const struct vdpa_config_ops *ops = vdpa->config; > u8 status, status_old; > - int ret, nvqs = v->nvqs; > + u32 nvqs = v->nvqs; > + int ret; > u16 i; > > if (copy_from_user(&status, statusp, sizeof(status))) > @@ -965,7 +966,8 @@ static int vhost_vdpa_open(struct inode *inode, struct > file *filep) > struct vhost_vdpa *v; > struct vhost_dev *dev; > struct vhost_virtqueue **vqs; > - int nvqs, i, r, opened; > + int r, opened; > + u32 i, nvqs; > > v = container_of(inode->i_cdev, struct vhost_vdpa, cdev); > > @@ -1018,7 +1020,7 @@ static int vhost_vdpa_open(struct inode *inode, > struct file *filep) > > static void vhost_vdpa_clean_irq(struct vhost_vdpa *v) > { > - int i; > + u32 i; > > for (i = 0; i < v->nvqs; i++) > vhost_vdpa_unsetup_vq_irq(v, i); > diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h > index a526919..8943a20 100644 > --- a/include/linux/vdpa.h > +++ b/include/linux/vdpa.h > @@ -83,7 +83,7 @@ struct vdpa_device { > unsigned int index; > bool features_valid; > bool use_va; > - int nvqs; > + u32 nvqs; > struct vdpa_mgmt_dev *mdev; > }; > > @@ -338,10 +338,10 @@ struct vdpa_device *__vdpa_alloc_device(struct > device *parent, > dev_struct, member)), name, > use_va), \ > dev_struct, member) > > -int vdpa_register_device(struct vdpa_device *vdev, int nvqs); > +int vdpa_register_device(struct vdpa_device *vdev, u32 nvqs); > void vdpa_unregister_device(struct vdpa_device *vdev); > > -int _vdpa_register_device(struct vdpa_device *vdev, int nvqs); > +int _vdpa_register_device(struct vdpa_device *vdev, u32 nvqs); > void _vdpa_unregister_device(struct vdpa_device *vdev); > > /** > -- > 1.8.3.1 > >
_______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
