Re: [PATCH v4 20/41] vfio/container: Implement attach/detach_device

[Cédric Le Goater]

On 11/2/23 08:12, Zhenzhong Duan wrote:

From: Eric Auger <eric.au...@redhat.com>

No fucntional change intended.

Signed-off-by: Eric Auger <eric.au...@redhat.com>
Signed-off-by: Yi Liu <yi.l....@intel.com>
Signed-off-by: Yi Sun <yi.y....@linux.intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.d...@intel.com>

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

Thanks,

C.

---
  hw/vfio/common.c    | 16 ++++++++++++++++
  hw/vfio/container.c | 12 +++++-------
  2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 8ef2e7967d..483ba82089 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1498,3 +1498,19 @@ retry:

return info;

  }
+
+int vfio_attach_device(char *name, VFIODevice *vbasedev,
+                       AddressSpace *as, Error **errp)
+{
+    const VFIOIOMMUOps *ops = &vfio_legacy_ops;
+
+    return ops->attach_device(name, vbasedev, as, errp);
+}
+
+void vfio_detach_device(VFIODevice *vbasedev)
+{
+    if (!vbasedev->bcontainer) {
+        return;
+    }
+    vbasedev->bcontainer->ops->detach_device(vbasedev);
+}
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 721c0d7375..6bacf38222 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -873,8 +873,8 @@ static int vfio_device_groupid(VFIODevice *vbasedev, Error 
**errp)
   * @name and @vbasedev->name are likely to be different depending
   * on the type of the device, hence the need for passing @name
   */
-int vfio_attach_device(char *name, VFIODevice *vbasedev,
-                       AddressSpace *as, Error **errp)
+static int vfio_legacy_attach_device(const char *name, VFIODevice *vbasedev,
+                                     AddressSpace *as, Error **errp)
  {
      int groupid = vfio_device_groupid(vbasedev, errp);
      VFIODevice *vbasedev_iter;
@@ -914,14 +914,10 @@ int vfio_attach_device(char *name, VFIODevice *vbasedev,
      return ret;
  }

-void vfio_detach_device(VFIODevice *vbasedev)

+static void vfio_legacy_detach_device(VFIODevice *vbasedev)
  {
      VFIOGroup *group = vbasedev->group;

- if (!vbasedev->bcontainer) {

-        return;
-    }
-
      QLIST_REMOVE(vbasedev, global_next);
      QLIST_REMOVE(vbasedev, container_next);
      vbasedev->bcontainer = NULL;
@@ -933,6 +929,8 @@ void vfio_detach_device(VFIODevice *vbasedev)
  const VFIOIOMMUOps vfio_legacy_ops = {
      .dma_map = vfio_legacy_dma_map,
      .dma_unmap = vfio_legacy_dma_unmap,
+    .attach_device = vfio_legacy_attach_device,
+    .detach_device = vfio_legacy_detach_device,
      .set_dirty_page_tracking = vfio_legacy_set_dirty_page_tracking,
      .query_dirty_bitmap = vfio_legacy_query_dirty_bitmap,
  };