From 5d258d732db9e77d523f9dd32da6e6927d5ca62f Mon Sep 17 00:00:00 2001 From: Jan Viktorin Date: Mon, 4 Jul 2016 17:16:48 +0200 Subject: [PATCH] vfio: make mode types private There is no more reason to expose those definitions as nobody uses them. Signed-off-by: Jan Viktorin --- lib/librte_eal/linuxapp/eal/eal_vfio.c | 15 +++++++++++++-- lib/librte_eal/linuxapp/eal/eal_vfio.h | 10 ---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c index d11f723fb4..fcb0ab38bb 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.c +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c @@ -49,6 +49,17 @@ /* per-process VFIO config */ static struct vfio_config vfio_cfg; +static int vfio_type1_dma_map(int); +static int vfio_noiommu_dma_map(int); + +/* IOMMU types we support */ +static const struct vfio_iommu_type iommu_types[] = { + /* x86 IOMMU, otherwise known as type 1 */ + { RTE_VFIO_TYPE1, "Type 1", &vfio_type1_dma_map}, + /* IOMMU-less mode */ + { RTE_VFIO_NOIOMMU, "No-IOMMU", &vfio_noiommu_dma_map}, +}; + int vfio_get_group_fd(int iommu_group_no) { @@ -494,7 +505,7 @@ vfio_get_group_no(const char *sysfs_base, return 1; } -int +static int vfio_type1_dma_map(int vfio_container_fd) { const struct rte_memseg *ms = rte_eal_get_physmem_layout(); @@ -526,7 +537,7 @@ vfio_type1_dma_map(int vfio_container_fd) return 0; } -int +static int vfio_noiommu_dma_map(int __rte_unused vfio_container_fd) { /* No-IOMMU mode does not need DMA mapping */ diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.h b/lib/librte_eal/linuxapp/eal/eal_vfio.h index b2b0d27fe2..67a52c623e 100644 --- a/lib/librte_eal/linuxapp/eal/eal_vfio.h +++ b/lib/librte_eal/linuxapp/eal/eal_vfio.h @@ -143,16 +143,6 @@ int vfio_setup_device(const char *sysfs_base, const char *dev_addr, int vfio_enable(const char *modname); int vfio_is_enabled(const char *modname); -int vfio_type1_dma_map(int); -int vfio_noiommu_dma_map(int); - -/* IOMMU types we support */ -static const struct vfio_iommu_type iommu_types[] = { - /* x86 IOMMU, otherwise known as type 1 */ - { RTE_VFIO_TYPE1, "Type 1", &vfio_type1_dma_map}, - /* IOMMU-less mode */ - { RTE_VFIO_NOIOMMU, "No-IOMMU", &vfio_noiommu_dma_map}, -}; #define SOCKET_REQ_CONTAINER 0x100 #define SOCKET_REQ_GROUP 0x200 -- 2.20.1