[PATCH v4 4/5] vfio: type1: replace vfio_domains_have_iommu_cache with generic function

[Baptiste Reynal]

From: Antonios Motakis <a.mota...@virtualopensystems.com>

Replace the function vfio_domains_have_iommu_cache() with a more generic
function vfio_domains_have_iommu_cap() which allows to check all domains
of an vfio_iommu structure for a given cached capability.

Signed-off-by: Antonios Motakis <a.mota...@virtualopensystems.com>
Signed-off-by: Baptiste Reynal <b.rey...@virtualopensystems.com>
---
 drivers/vfio/vfio_iommu_type1.c | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 998619b..0ea371b 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -82,6 +82,23 @@ struct vfio_group {
        struct list_head        next;
 };
 
+static int vfio_domains_have_iommu_cap(struct vfio_iommu *iommu, int cap)
+{
+       struct vfio_domain *domain;
+       int ret = 1;
+
+       mutex_lock(&iommu->lock);
+       list_for_each_entry(domain, &iommu->domain_list, next) {
+               if (!(domain->caps & cap)) {
+                       ret = 0;
+                       break;
+               }
+       }
+       mutex_unlock(&iommu->lock);
+
+       return ret;
+}
+
 /*
  * This code handles mapping and unmapping of user data buffers
  * into DMA'ble space using the IOMMU
@@ -948,23 +965,6 @@ static void vfio_iommu_type1_release(void *iommu_data)
        kfree(iommu);
 }
 
-static int vfio_domains_have_iommu_cache(struct vfio_iommu *iommu)
-{
-       struct vfio_domain *domain;
-       int ret = 1;
-
-       mutex_lock(&iommu->lock);
-       list_for_each_entry(domain, &iommu->domain_list, next) {
-               if (!(domain->caps & IOMMU_CAP_CACHE_COHERENCY)) {
-                       ret = 0;
-                       break;
-               }
-       }
-       mutex_unlock(&iommu->lock);
-
-       return ret;
-}
-
 static long vfio_iommu_type1_ioctl(void *iommu_data,
                                   unsigned int cmd, unsigned long arg)
 {
@@ -980,7 +980,8 @@ static long vfio_iommu_type1_ioctl(void *iommu_data,
                case VFIO_DMA_CC_IOMMU:
                        if (!iommu)
                                return 0;
-                       return vfio_domains_have_iommu_cache(iommu);
+                       return vfio_domains_have_iommu_cap(iommu,
+                                                 IOMMU_CAP_CACHE_COHERENCY);
                default:
                        return 0;
                }
-- 
2.3.1

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html