History

Merge tag 'vfio-v5.16-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson: - Cleanup vfio iommu_group creation (Christoph Hellwig) - Add individual device reset for vfio/fsl-mc (Diana Craciun) - IGD OpRegion 2.0+ support (Colin Xu) - Use modern cdev lifecycle for vfio_group (Jason Gunthorpe) - Use new mdev API in vfio_ccw (Jason Gunthorpe) * tag 'vfio-v5.16-rc1' of git://github.com/awilliam/linux-vfio: (27 commits) vfio/ccw: Convert to use vfio_register_emulated_iommu_dev() vfio/ccw: Pass vfio_ccw_private not mdev_device to various functions vfio/ccw: Use functions for alloc/free of the vfio_ccw_private vfio/ccw: Remove unneeded GFP_DMA vfio: Use cdev_device_add() instead of device_create() vfio: Use a refcount_t instead of a kref in the vfio_group vfio: Don't leak a group reference if the group already exists vfio: Do not open code the group list search in vfio_create_group() vfio: Delete vfio_get/put_group from vfio_iommu_group_notifier() vfio/pci: Add OpRegion 2.0+ Extended VBT support. vfio/iommu_type1: remove IS_IOMMU_CAP_DOMAIN_IN_CONTAINER vfio/iommu_type1: remove the "external" domain vfio/iommu_type1: initialize pgsize_bitmap in ->open vfio/spapr_tce: reject mediated devices vfio: clean up the check for mediated device in vfio_iommu_type1 vfio: remove the unused mdev iommu hook vfio: move the vfio_iommu_driver_ops interface out of <linux/vfio.h> vfio: remove unused method from vfio_iommu_driver_ops vfio: simplify iommu group allocation for mediated devices vfio: remove the iommudata hack for noiommu groups ...

Linus Torvalds committed 5 years ago

Commit d4ec3d52 parents a602285 3bf131123 files · +945 −903Browse files

Showing the changes to samples (3 of 23 files). Show all

Unified · Split

3 files
  1. samples/vfio-mdev/mbochs.c +1 −1
  2. samples/vfio-mdev/mdpy.c +1 −1
  3. samples/vfio-mdev/mtty.c +1 −1
samples/vfio-mdev/mbochs.c+1−1
@@ -553,7 +553,7 @@ static int mbochs_probe(struct mdev_device *mdev) · 552 unmodified lines
553 mbochs_create_config_space(mdev_state);553 mbochs_create_config_space(mdev_state);
554 mbochs_reset(mdev_state);554 mbochs_reset(mdev_state);
555 555
556 ret = vfio_register_group_dev(&mdev_state->vdev);556 ret = vfio_register_emulated_iommu_dev(&mdev_state->vdev);
557 if (ret)557 if (ret)
558 goto err_mem;558 goto err_mem;
559 dev_set_drvdata(&mdev->dev, mdev_state);559 dev_set_drvdata(&mdev->dev, mdev_state);
samples/vfio-mdev/mdpy.c+1−1
@@ -258,7 +258,7 @@ static int mdpy_probe(struct mdev_device *mdev) · 257 unmodified lines
258 258
259 mdpy_count++;259 mdpy_count++;
260 260
261 ret = vfio_register_group_dev(&mdev_state->vdev);261 ret = vfio_register_emulated_iommu_dev(&mdev_state->vdev);
262 if (ret)262 if (ret)
263 goto err_mem;263 goto err_mem;
264 dev_set_drvdata(&mdev->dev, mdev_state);264 dev_set_drvdata(&mdev->dev, mdev_state);
samples/vfio-mdev/mtty.c+1−1
@@ -741,7 +741,7 @@ static int mtty_probe(struct mdev_device *mdev) · 740 unmodified lines
741 741
742 mtty_create_config_space(mdev_state);742 mtty_create_config_space(mdev_state);
743 743
744 ret = vfio_register_group_dev(&mdev_state->vdev);744 ret = vfio_register_emulated_iommu_dev(&mdev_state->vdev);
745 if (ret)745 if (ret)
746 goto err_vconfig;746 goto err_vconfig;
747 dev_set_drvdata(&mdev->dev, mdev_state);747 dev_set_drvdata(&mdev->dev, mdev_state);