Commit dd56ef23 authored by David Matlack's avatar David Matlack Committed by Alex Williamson
Browse files

vfio: selftests: Rename struct vfio_iommu_mode to iommu_mode 



Rename struct vfio_iommu_mode to struct iommu_mode since the mode can
include iommufd. This also prepares for splitting out all the IOMMU code
into its own structs/helpers/files which are independent from the
vfio_pci_device code.

No function change intended.

Reviewed-by: default avatarAlex Mastro <amastro@fb.com>
Tested-by: default avatarAlex Mastro <amastro@fb.com>
Reviewed-by: default avatarRaghavendra Rao Ananta <rananta@google.com>
Signed-off-by: default avatarDavid Matlack <dmatlack@google.com>
Link: https://lore.kernel.org/r/20251126231733.3302983-5-dmatlack@google.com


Signed-off-by: default avatarAlex Williamson <alex@shazbot.org>
parent 6282ca85

tools/testing/selftests/vfio/lib/include/vfio_util.h

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
	VFIO_LOG_AND_EXIT(_fmt, ##__VA_ARGS__);			\

} while (0)



struct vfio_iommu_mode {

struct iommu_mode {

	const char *name;

	const char *container_path;

	unsigned long iommu_type;
@@ -166,7 +166,7 @@ struct vfio_pci_driver { 
struct vfio_pci_device {

	int fd;



	const struct vfio_iommu_mode *iommu_mode;

	const struct iommu_mode *iommu_mode;

	int group_fd;

	int container_fd;

tools/testing/selftests/vfio/lib/vfio_pci_device.c

+2 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ const char *vfio_pci_get_cdev_path(const char *bdf) 
}



/* Reminder: Keep in sync with FIXTURE_VARIANT_ADD_ALL_IOMMU_MODES(). */

static const struct vfio_iommu_mode iommu_modes[] = {

static const struct iommu_mode iommu_modes[] = {

	{

		.name = "vfio_type1_iommu",

		.container_path = "/dev/vfio/vfio",
@@ -741,7 +741,7 @@ static const struct vfio_iommu_mode iommu_modes[] = { 


const char *default_iommu_mode = "iommufd";



static const struct vfio_iommu_mode *lookup_iommu_mode(const char *iommu_mode)

static const struct iommu_mode *lookup_iommu_mode(const char *iommu_mode)

{

	int i;