X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Feal%2Flinux%2Feal_vfio.c;h=549b86ae1d64ebefd88d41306d4af9b50b267235;hb=4042dc2037a1509596f7eb48370185434bad39cc;hp=657c89ca585393d6d4fcd969d086d73e44f7e188;hpb=56259f7fc0104ca73f776b76cfd056ccf0470e4c;p=dpdk.git

diff --git a/lib/eal/linux/eal_vfio.c b/lib/eal/linux/eal_vfio.c
index 657c89ca58..549b86ae1d 100644
--- a/lib/eal/linux/eal_vfio.c
+++ b/lib/eal/linux/eal_vfio.c
@@ -20,8 +20,6 @@
 #include "eal_private.h"
 #include "eal_internal_cfg.h"
 
-#ifdef VFIO_PRESENT
-
 #define VFIO_MEM_EVENT_CLB_NAME "vfio_mem_event_clb"
 
 /* hot plug/unplug of VFIO groups may cause all DMA maps to be dropped. we can
@@ -1943,9 +1941,6 @@ container_dma_unmap(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
 	 * mappings, let's just rebuild them using information we have.
 	 */
 
-	/* do we have partial unmap capability? */
-	has_partial_unmap = vfio_cfg->vfio_iommu_type->partial_unmap;
-
 	/*
 	 * first thing to do is check if there exists a mapping that includes
 	 * the start and the end of our requested unmap. We need to collect all
@@ -1961,6 +1956,9 @@ container_dma_unmap(struct vfio_config *vfio_cfg, uint64_t vaddr, uint64_t iova,
 		goto out;
 	}
 
+	/* do we have partial unmap capability? */
+	has_partial_unmap = vfio_cfg->vfio_iommu_type->partial_unmap;
+
 	/*
 	 * if we don't support partial unmap, we must check if start and end of
 	 * current unmap region are chunk-aligned.
@@ -2201,111 +2199,3 @@ rte_vfio_container_dma_unmap(int container_fd, uint64_t vaddr, uint64_t iova,
 
 	return container_dma_unmap(vfio_cfg, vaddr, iova, len);
 }
-
-#else
-
-int
-rte_vfio_setup_device(__rte_unused const char *sysfs_base,
-		__rte_unused const char *dev_addr,
-		__rte_unused int *vfio_dev_fd,
-		__rte_unused struct vfio_device_info *device_info)
-{
-	return -1;
-}
-
-int
-rte_vfio_release_device(__rte_unused const char *sysfs_base,
-		__rte_unused const char *dev_addr, __rte_unused int fd)
-{
-	return -1;
-}
-
-int
-rte_vfio_enable(__rte_unused const char *modname)
-{
-	return -1;
-}
-
-int
-rte_vfio_is_enabled(__rte_unused const char *modname)
-{
-	return -1;
-}
-
-int
-rte_vfio_noiommu_is_enabled(void)
-{
-	return -1;
-}
-
-int
-rte_vfio_clear_group(__rte_unused int vfio_group_fd)
-{
-	return -1;
-}
-
-int
-rte_vfio_get_group_num(__rte_unused const char *sysfs_base,
-		__rte_unused const char *dev_addr,
-		__rte_unused int *iommu_group_num)
-{
-	return -1;
-}
-
-int
-rte_vfio_get_container_fd(void)
-{
-	return -1;
-}
-
-int
-rte_vfio_get_group_fd(__rte_unused int iommu_group_num)
-{
-	return -1;
-}
-
-int
-rte_vfio_container_create(void)
-{
-	return -1;
-}
-
-int
-rte_vfio_container_destroy(__rte_unused int container_fd)
-{
-	return -1;
-}
-
-int
-rte_vfio_container_group_bind(__rte_unused int container_fd,
-		__rte_unused int iommu_group_num)
-{
-	return -1;
-}
-
-int
-rte_vfio_container_group_unbind(__rte_unused int container_fd,
-		__rte_unused int iommu_group_num)
-{
-	return -1;
-}
-
-int
-rte_vfio_container_dma_map(__rte_unused int container_fd,
-		__rte_unused uint64_t vaddr,
-		__rte_unused uint64_t iova,
-		__rte_unused uint64_t len)
-{
-	return -1;
-}
-
-int
-rte_vfio_container_dma_unmap(__rte_unused int container_fd,
-		__rte_unused uint64_t vaddr,
-		__rte_unused uint64_t iova,
-		__rte_unused uint64_t len)
-{
-	return -1;
-}
-
-#endif /* VFIO_PRESENT */