Re: [PATCH 03/14] vfio: add vfio_prepare_device()

[Cédric Le Goater]

Subject needs fix.

On 4/9/25 15:48, John Levon wrote:

Commonize some initialization code shared by the legacy and iommufd vfio
implementations.

May be vfio_device_set_info() would be a better name ? Anyhow,


Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

Signed-off-by: John Levon <john.le...@nutanix.com>> ---
  hw/vfio/container.c           | 14 ++------------
  hw/vfio/device.c              | 14 ++++++++++++++
  hw/vfio/iommufd.c             |  9 +--------
  include/hw/vfio/vfio-device.h |  3 +++
  4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 23a3373470..4fc181d33b 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -811,18 +811,14 @@ static bool vfio_device_get(VFIOGroup *group, const char 
*name,
          }
      }

+ vfio_device_prepare(vbasedev, &group->container->bcontainer, info);

+
      vbasedev->fd = fd;
      vbasedev->group = group;
      QLIST_INSERT_HEAD(&group->device_list, vbasedev, next);

- vbasedev->num_irqs = info->num_irqs;

-    vbasedev->num_regions = info->num_regions;
-    vbasedev->flags = info->flags;
-
      trace_vfio_device_get(name, info->flags, info->num_regions, 
info->num_irqs);

- vbasedev->reset_works = !!(info->flags & VFIO_DEVICE_FLAGS_RESET);

-
      return true;
  }

@@ -875,7 +871,6 @@ static bool vfio_legacy_attach_device(const char *name, VFIODevice *vbasedev,

      int groupid = vfio_device_get_groupid(vbasedev, errp);
      VFIODevice *vbasedev_iter;
      VFIOGroup *group;
-    VFIOContainerBase *bcontainer;

if (groupid < 0) {

          return false;
@@ -904,11 +899,6 @@ static bool vfio_legacy_attach_device(const char *name, 
VFIODevice *vbasedev,
          return false;
      }

- bcontainer = &group->container->bcontainer;

-    vbasedev->bcontainer = bcontainer;
-    QLIST_INSERT_HEAD(&bcontainer->device_list, vbasedev, container_next);
-    QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next);
-
      return true;
  }

diff --git a/hw/vfio/device.c b/hw/vfio/device.c

index 4de6948cf4..4d940ddb3a 100644
--- a/hw/vfio/device.c
+++ b/hw/vfio/device.c
@@ -403,3 +403,17 @@ void vfio_device_detach(VFIODevice *vbasedev)
      object_unref(vbasedev->hiod);
      VFIO_IOMMU_GET_CLASS(vbasedev->bcontainer)->detach_device(vbasedev);
  }
+
+void vfio_device_prepare(VFIODevice *vbasedev, VFIOContainerBase *bcontainer,
+                         struct vfio_device_info *info)
+{
+    vbasedev->num_irqs = info->num_irqs;
+    vbasedev->num_regions = info->num_regions;
+    vbasedev->flags = info->flags;
+    vbasedev->reset_works = !!(info->flags & VFIO_DEVICE_FLAGS_RESET);
+
+    vbasedev->bcontainer = bcontainer;
+    QLIST_INSERT_HEAD(&bcontainer->device_list, vbasedev, container_next);
+
+    QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next);
+}
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
index 48db105422..1874185fcf 100644
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -587,14 +587,7 @@ found_container:
          iommufd_cdev_ram_block_discard_disable(false);
      }

- vbasedev->group = 0;

-    vbasedev->num_irqs = dev_info.num_irqs;
-    vbasedev->num_regions = dev_info.num_regions;
-    vbasedev->flags = dev_info.flags;
-    vbasedev->reset_works = !!(dev_info.flags & VFIO_DEVICE_FLAGS_RESET);
-    vbasedev->bcontainer = bcontainer;
-    QLIST_INSERT_HEAD(&bcontainer->device_list, vbasedev, container_next);
-    QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next);
+    vfio_device_prepare(vbasedev, bcontainer, &dev_info);

trace_iommufd_cdev_device_info(vbasedev->name, devfd, vbasedev->num_irqs,

                                     vbasedev->num_regions, vbasedev->flags);
diff --git a/include/hw/vfio/vfio-device.h b/include/hw/vfio/vfio-device.h
index 66797b4c92..1a2fe378d0 100644
--- a/include/hw/vfio/vfio-device.h
+++ b/include/hw/vfio/vfio-device.h
@@ -129,6 +129,9 @@ bool vfio_device_attach(char *name, VFIODevice *vbasedev,
  void vfio_device_detach(VFIODevice *vbasedev);
  VFIODevice *vfio_get_vfio_device(Object *obj);

+void vfio_device_prepare(VFIODevice *vbasedev, VFIOContainerBase *bcontainer,

+                         struct vfio_device_info *info);
+
  typedef QLIST_HEAD(VFIODeviceList, VFIODevice) VFIODeviceList;
  extern VFIODeviceList vfio_device_list;