Commit b0d2d569 authored by Matthew Rosato's avatar Matthew Rosato Committed by Alex Williamson
Browse files

vfio: no need to pass kvm pointer during device open 



Nothing uses this value during vfio_device_open anymore so it's safe
to remove it.

Signed-off-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Tested-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarYi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20230203215027.151988-3-mjrosato@linux.ibm.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 2b48f52f

drivers/vfio/group.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int vfio_device_group_open(struct vfio_device *device) 
	if (device->open_count == 0)

		vfio_device_group_get_kvm_safe(device);



	ret = vfio_device_open(device, device->group->iommufd, device->kvm);

	ret = vfio_device_open(device, device->group->iommufd);



	if (device->open_count == 0)

		vfio_device_put_kvm(device);

drivers/vfio/vfio.h

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ struct vfio_container; 


void vfio_device_put_registration(struct vfio_device *device);

bool vfio_device_try_get_registration(struct vfio_device *device);

int vfio_device_open(struct vfio_device *device,

		     struct iommufd_ctx *iommufd, struct kvm *kvm);

int vfio_device_open(struct vfio_device *device, struct iommufd_ctx *iommufd);

void vfio_device_close(struct vfio_device *device,

		       struct iommufd_ctx *iommufd);

drivers/vfio/vfio_main.c

+3 −4
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static bool vfio_assert_device_open(struct vfio_device *device) 
}



static int vfio_device_first_open(struct vfio_device *device,

				  struct iommufd_ctx *iommufd, struct kvm *kvm)

				  struct iommufd_ctx *iommufd)

{

	int ret;
@@ -444,8 +444,7 @@ static void vfio_device_last_close(struct vfio_device *device, 
	module_put(device->dev->driver->owner);

}



int vfio_device_open(struct vfio_device *device,

		     struct iommufd_ctx *iommufd, struct kvm *kvm)

int vfio_device_open(struct vfio_device *device, struct iommufd_ctx *iommufd)

{

	int ret = 0;
@@ -453,7 +452,7 @@ int vfio_device_open(struct vfio_device *device, 


	device->open_count++;

	if (device->open_count == 1) {

		ret = vfio_device_first_open(device, iommufd, kvm);

		ret = vfio_device_first_open(device, iommufd);

		if (ret)

			device->open_count--;

	}