[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v3 09/18] vfio/platform: Use vfio_[attach/detach]_device
From: |
Eric Auger |
Subject: |
[RFC v3 09/18] vfio/platform: Use vfio_[attach/detach]_device |
Date: |
Tue, 31 Jan 2023 21:52:56 +0100 |
Let the vfio-platform device use vfio_attach_device() and
vfio_detach_device(), hence hiding the details of the used
IOMMU backend.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
hw/vfio/platform.c | 42 ++----------------------------------------
1 file changed, 2 insertions(+), 40 deletions(-)
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 5af73f9287..3bcdc20667 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -529,12 +529,7 @@ static VFIODeviceOps vfio_platform_ops = {
*/
static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
{
- VFIOGroup *group;
- VFIODevice *vbasedev_iter;
- char *tmp, group_path[PATH_MAX], *group_name;
- ssize_t len;
struct stat st;
- int groupid;
int ret;
/* @sysfsdev takes precedence over @host */
@@ -557,47 +552,14 @@ static int vfio_base_device_init(VFIODevice *vbasedev,
Error **errp)
return -errno;
}
- tmp = g_strdup_printf("%s/iommu_group", vbasedev->sysfsdev);
- len = readlink(tmp, group_path, sizeof(group_path));
- g_free(tmp);
-
- if (len < 0 || len >= sizeof(group_path)) {
- ret = len < 0 ? -errno : -ENAMETOOLONG;
- error_setg_errno(errp, -ret, "no iommu_group found");
- return ret;
- }
-
- group_path[len] = 0;
-
- group_name = basename(group_path);
- if (sscanf(group_name, "%d", &groupid) != 1) {
- error_setg_errno(errp, errno, "failed to read %s", group_path);
- return -errno;
- }
-
- trace_vfio_platform_base_device_init(vbasedev->name, groupid);
-
- group = vfio_get_group(groupid, &address_space_memory, errp);
- if (!group) {
- return -ENOENT;
- }
-
- QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
- if (strcmp(vbasedev_iter->name, vbasedev->name) == 0) {
- error_setg(errp, "device is already attached");
- vfio_put_group(group);
- return -EBUSY;
- }
- }
- ret = vfio_get_device(group, vbasedev->name, vbasedev, errp);
+ ret = vfio_attach_device(vbasedev, &address_space_memory, errp);
if (ret) {
- vfio_put_group(group);
return ret;
}
ret = vfio_populate_device(vbasedev, errp);
if (ret) {
- vfio_put_group(group);
+ vfio_detach_device(vbasedev);
}
return ret;
--
2.37.3
- [RFC v3 00/18] vfio: Adopt iommufd, Eric Auger, 2023/01/31
- [RFC v3 01/18] scripts/update-linux-headers: Add iommufd.h, Eric Auger, 2023/01/31
- [RFC v3 02/18] linux-headers: Import vfio.h and iommufd.h, Eric Auger, 2023/01/31
- [RFC v3 03/18] vfio/common: Move IOMMU agnostic helpers to a separate file, Eric Auger, 2023/01/31
- [RFC v3 04/18] vfio/common: Introduce vfio_container_add|del_section_window(), Eric Auger, 2023/01/31
- [RFC v3 05/18] vfio/common: Move legacy VFIO backend code into separate container.c, Eric Auger, 2023/01/31
- [RFC v3 06/18] vfio/common: Rename into as.c, Eric Auger, 2023/01/31
- [RFC v3 07/18] vfio: Add base container, Eric Auger, 2023/01/31
- [RFC v3 08/18] vfio/container: Introduce vfio_[attach/detach]_device, Eric Auger, 2023/01/31
- [RFC v3 09/18] vfio/platform: Use vfio_[attach/detach]_device,
Eric Auger <=
- [RFC v3 10/18] vfio/ap: Use vfio_[attach/detach]_device, Eric Auger, 2023/01/31
- [RFC v3 11/18] vfio/ccw: Use vfio_[attach/detach]_device, Eric Auger, 2023/01/31
- [RFC v3 12/18] vfio/container-base: Introduce [attach/detach]_device container callbacks, Eric Auger, 2023/01/31
- [RFC v3 13/18] vfio/container-base: Introduce VFIOContainer reset callback, Eric Auger, 2023/01/31
- [RFC v3 14/18] backends/iommufd: Introduce the iommufd object, Eric Auger, 2023/01/31
- [RFC v3 15/18] util/char_dev: Add open_cdev(), Eric Auger, 2023/01/31
- [RFC v3 16/18] vfio/iommufd: Implement the iommufd backend, Eric Auger, 2023/01/31
- [RFC v3 17/18] vfio/iommufd: Add IOAS_COPY_DMA support, Eric Auger, 2023/01/31
- [RFC v3 18/18] vfio/as: Allow the selection of a given iommu backend, Eric Auger, 2023/01/31