Commit 81d46d69 authored by Longpeng's avatar Longpeng Committed by Michael S. Tsirkin
Browse files

vdpa: change the type of nvqs to u32 



Change vdpa_device.nvqs and vhost_vdpa.nvqs to use u32

Signed-off-by: default avatarLongpeng <longpeng2@huawei.com>
Link: https://lore.kernel.org/r/20220315032553.455-3-longpeng2@huawei.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: Longpeng &lt;<a href="mailto:longpeng2@huawei.com" target="_blank">longpeng2@huawei.com</a>&gt;<br></blockquote><div><br></div><div>Acked-by: Jason Wang &lt;<a href="mailto:jasowang@redhat.com">jasowang@redhat.com</a>&gt;</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
parent a61280dd

drivers/vdpa/vdpa.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ EXPORT_SYMBOL_GPL(_vdpa_register_device); 
 *

 * 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;

drivers/vhost/vdpa.c

+6 −4
Original line number Diff line number Diff line
@@ -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;
@@ -161,7 +161,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)))
@@ -968,7 +969,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);
@@ -1021,7 +1023,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);

include/linux/vdpa.h

+3 −3
Original line number Diff line number Diff line
@@ -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);



/**