[RFC PATCH kvmtool 02/10] vfio: Rename some functions

["Aneesh Kumar K.V (Arm)" <aneesh.kumar@kernel.org>]

We will add iommufd support in later patches. Rename the old vfio
method as legacy vfio.

Signed-off-by: Aneesh Kumar K.V (Arm) <aneesh.kumar@kernel.org>
---
 vfio/core.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/vfio/core.c b/vfio/core.c
index c6b305c30cf7..424dc4ed3aef 100644
--- a/vfio/core.c
+++ b/vfio/core.c
@@ -282,7 +282,7 @@ void vfio_unmap_region(struct kvm *kvm, struct vfio_region *region)
 	}
 }
 
-static int vfio_configure_device(struct kvm *kvm, struct vfio_device *vdev)
+static int legacy_vfio_configure_device(struct kvm *kvm, struct vfio_device *vdev)
 {
 	int ret;
 	struct vfio_group *group = vdev->group;
@@ -340,12 +340,12 @@ err_close_device:
 	return ret;
 }
 
-static int vfio_configure_devices(struct kvm *kvm)
+static int legacy_vfio_configure_devices(struct kvm *kvm)
 {
 	int i, ret;
 
 	for (i = 0; i < kvm->cfg.num_vfio_devices; ++i) {
-		ret = vfio_configure_device(kvm, &vfio_devices[i]);
+		ret = legacy_vfio_configure_device(kvm, &vfio_devices[i]);
 		if (ret)
 			return ret;
 	}
@@ -429,7 +429,7 @@ static int vfio_configure_reserved_regions(struct kvm *kvm,
 	return ret;
 }
 
-static int vfio_configure_groups(struct kvm *kvm)
+static int legacy_vfio_configure_groups(struct kvm *kvm)
 {
 	int ret;
 	struct vfio_group *group;
@@ -454,7 +454,7 @@ static int vfio_configure_groups(struct kvm *kvm)
 	return 0;
 }
 
-static struct vfio_group *vfio_group_create(struct kvm *kvm, unsigned long id)
+static struct vfio_group *legacy_vfio_group_create(struct kvm *kvm, unsigned long id)
 {
 	int ret;
 	struct vfio_group *group;
@@ -512,10 +512,11 @@ static void vfio_group_exit(struct kvm *kvm, struct vfio_group *group)
 	if (--group->refs != 0)
 		return;
 
-	ioctl(group->fd, VFIO_GROUP_UNSET_CONTAINER);
-
 	list_del(&group->list);
-	close(group->fd);
+	if (group->fd != -1) {
+		ioctl(group->fd, VFIO_GROUP_UNSET_CONTAINER);
+		close(group->fd);
+	}
 	free(group);
 }
 
@@ -559,14 +560,14 @@ vfio_group_get_for_dev(struct kvm *kvm, struct vfio_device *vdev)
 		}
 	}
 
-	group = vfio_group_create(kvm, group_id);
+	group = legacy_vfio_group_create(kvm, group_id);
 
 out_close:
 	close(dirfd);
 	return group;
 }
 
-static int vfio_device_init(struct kvm *kvm, struct vfio_device *vdev)
+static int legacy_vfio_device_init(struct kvm *kvm, struct vfio_device *vdev)
 {
 	int ret;
 	char dev_path[PATH_MAX];
@@ -610,7 +611,7 @@ static void vfio_device_exit(struct kvm *kvm, struct vfio_device *vdev)
 	free(vdev->sysfs_path);
 }
 
-static int vfio_container_init(struct kvm *kvm)
+static int legacy_vfio_container_init(struct kvm *kvm)
 {
 	int api, i, ret, iommu_type;;
 
@@ -638,7 +639,7 @@ static int vfio_container_init(struct kvm *kvm)
 	for (i = 0; i < kvm->cfg.num_vfio_devices; ++i) {
 		vfio_devices[i].params = &kvm->cfg.vfio_devices[i];
 
-		ret = vfio_device_init(kvm, &vfio_devices[i]);
+		ret = legacy_vfio_device_init(kvm, &vfio_devices[i]);
 		if (ret)
 			return ret;
 	}
@@ -678,15 +679,15 @@ static int vfio__init(struct kvm *kvm)
 	}
 	kvm_vfio_device = device.fd;
 
-	ret = vfio_container_init(kvm);
+	ret = legacy_vfio_container_init(kvm);
 	if (ret)
 		return ret;
 
-	ret = vfio_configure_groups(kvm);
+	ret = legacy_vfio_configure_groups(kvm);
 	if (ret)
 		return ret;
 
-	ret = vfio_configure_devices(kvm);
+	ret = legacy_vfio_configure_devices(kvm);
 	if (ret)
 		return ret;
 
-- 
2.43.0