qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
	"Eric Auger" <eric.auger@redhat.com>,
	"Yi Liu" <yi.l.liu@intel.com>,
	"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
	"Matthew Rosato" <mjrosato@linux.ibm.com>,
	"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 09/22] vfio/ap: Use vfio_[attach/detach]_device
Date: Wed, 18 Oct 2023 11:45:18 +0200	[thread overview]
Message-ID: <20231018094531.733211-10-clg@redhat.com> (raw)
In-Reply-To: <20231018094531.733211-1-clg@redhat.com>

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

Let the vfio-ap device use vfio_attach_device() and
vfio_detach_device(), hence hiding the details of the used
IOMMU backend.

We take the opportunity to use g_path_get_basename() which
is prefered, as suggested by
3e015d815b ("use g_path_get_basename instead of basename")

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 hw/vfio/ap.c | 67 ++++++++++------------------------------------------
 1 file changed, 13 insertions(+), 54 deletions(-)

diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index 6e21d1da5a7090a6b9c77485d67e8eabc261438f..f870f51ffab4a637d2472db4fe4141ec7c54a470 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -53,40 +53,6 @@ struct VFIODeviceOps vfio_ap_ops = {
     .vfio_compute_needs_reset = vfio_ap_compute_needs_reset,
 };
 
-static void vfio_ap_put_device(VFIOAPDevice *vapdev)
-{
-    g_free(vapdev->vdev.name);
-    vfio_put_base_device(&vapdev->vdev);
-}
-
-static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev, Error **errp)
-{
-    GError *gerror = NULL;
-    char *symlink, *group_path;
-    int groupid;
-
-    symlink = g_strdup_printf("%s/iommu_group", vapdev->vdev.sysfsdev);
-    group_path = g_file_read_link(symlink, &gerror);
-    g_free(symlink);
-
-    if (!group_path) {
-        error_setg(errp, "%s: no iommu_group found for %s: %s",
-                   TYPE_VFIO_AP_DEVICE, vapdev->vdev.sysfsdev, gerror->message);
-        g_error_free(gerror);
-        return NULL;
-    }
-
-    if (sscanf(basename(group_path), "%d", &groupid) != 1) {
-        error_setg(errp, "vfio: failed to read %s", group_path);
-        g_free(group_path);
-        return NULL;
-    }
-
-    g_free(group_path);
-
-    return vfio_get_group(groupid, &address_space_memory, errp);
-}
-
 static void vfio_ap_req_notifier_handler(void *opaque)
 {
     VFIOAPDevice *vapdev = opaque;
@@ -189,22 +155,15 @@ static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
 static void vfio_ap_realize(DeviceState *dev, Error **errp)
 {
     int ret;
-    char *mdevid;
     Error *err = NULL;
-    VFIOGroup *vfio_group;
     APDevice *apdev = AP_DEVICE(dev);
     VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev);
+    VFIODevice *vbasedev = &vapdev->vdev;
 
-    vfio_group = vfio_ap_get_group(vapdev, errp);
-    if (!vfio_group) {
-        return;
-    }
-
-    vapdev->vdev.ops = &vfio_ap_ops;
-    vapdev->vdev.type = VFIO_DEVICE_TYPE_AP;
-    mdevid = basename(vapdev->vdev.sysfsdev);
-    vapdev->vdev.name = g_strdup_printf("%s", mdevid);
-    vapdev->vdev.dev = dev;
+    vbasedev->name = g_path_get_basename(vbasedev->sysfsdev);
+    vbasedev->ops = &vfio_ap_ops;
+    vbasedev->type = VFIO_DEVICE_TYPE_AP;
+    vbasedev->dev = dev;
 
     /*
      * vfio-ap devices operate in a way compatible with discarding of
@@ -214,9 +173,10 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
      */
     vapdev->vdev.ram_block_discard_allowed = true;
 
-    ret = vfio_get_device(vfio_group, mdevid, &vapdev->vdev, errp);
+    ret = vfio_attach_device(vbasedev->name, vbasedev,
+                             &address_space_memory, errp);
     if (ret) {
-        goto out_get_dev_err;
+        goto error;
     }
 
     vfio_ap_register_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX, &err);
@@ -230,20 +190,19 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
 
     return;
 
-out_get_dev_err:
-    vfio_ap_put_device(vapdev);
-    vfio_put_group(vfio_group);
+error:
+    error_prepend(errp, VFIO_MSG_PREFIX, vbasedev->name);
+    g_free(vbasedev->name);
 }
 
 static void vfio_ap_unrealize(DeviceState *dev)
 {
     APDevice *apdev = AP_DEVICE(dev);
     VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev);
-    VFIOGroup *group = vapdev->vdev.group;
 
     vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX);
-    vfio_ap_put_device(vapdev);
-    vfio_put_group(group);
+    vfio_detach_device(&vapdev->vdev);
+    g_free(vapdev->vdev.name);
 }
 
 static Property vfio_ap_properties[] = {
-- 
2.41.0



  parent reply	other threads:[~2023-10-18  9:52 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-18  9:45 [PULL 00/22] vfio queue Cédric Le Goater
2023-10-18  9:45 ` [PULL 01/22] scripts/update-linux-headers: Add iommufd.h Cédric Le Goater
2023-10-18  9:45 ` [PULL 02/22] linux-headers: " Cédric Le Goater
2023-10-18  9:45 ` [PULL 03/22] vfio/common: Move IOMMU agnostic helpers to a separate file Cédric Le Goater
2023-10-18  9:45 ` [PULL 04/22] vfio/common: Propagate KVM_SET_DEVICE_ATTR error if any Cédric Le Goater
2023-10-18  9:45 ` [PULL 05/22] vfio/common: Introduce vfio_container_add|del_section_window() Cédric Le Goater
2023-10-18  9:45 ` [PULL 06/22] vfio/common: Extract out vfio_kvm_device_[add/del]_fd Cédric Le Goater
2023-10-18  9:45 ` [PULL 07/22] vfio/pci: Introduce vfio_[attach/detach]_device Cédric Le Goater
2023-10-18  9:45 ` [PULL 08/22] vfio/platform: Use vfio_[attach/detach]_device Cédric Le Goater
2023-10-18  9:45 ` Cédric Le Goater [this message]
2023-10-18  9:45 ` [PULL 10/22] vfio/ccw: " Cédric Le Goater
2023-10-18  9:45 ` [PULL 11/22] vfio/common: Move VFIO reset handler registration to a group agnostic function Cédric Le Goater
2023-10-18  9:45 ` [PULL 12/22] vfio/common: Introduce a per container device list Cédric Le Goater
2023-10-18  9:45 ` [PULL 13/22] vfio/common: Store the parent container in VFIODevice Cédric Le Goater
2023-10-18  9:45 ` [PULL 14/22] vfio/common: Introduce a global VFIODevice list Cédric Le Goater
2023-10-18  9:45 ` [PULL 15/22] vfio/common: Move legacy VFIO backend code into separate container.c Cédric Le Goater
2023-10-18  9:45 ` [PULL 16/22] vfio/pci: Fix a potential memory leak in vfio_listener_region_add Cédric Le Goater
2023-10-18  9:45 ` [PULL 17/22] vfio/ap: Remove pointless apdev variable Cédric Le Goater
2023-10-18  9:45 ` [PULL 18/22] vfio/ccw: Remove redundant definition of TYPE_VFIO_CCW Cédric Le Goater
2023-10-18  9:45 ` [PULL 19/22] vfio/pci: Remove vfio_detach_device from vfio_realize error path Cédric Le Goater
2023-10-18  9:45 ` [PULL 20/22] ramfb: add migration support Cédric Le Goater
2023-10-18  9:45 ` [PULL 21/22] ramfb-standalone: " Cédric Le Goater
2023-10-18  9:45 ` [PULL 22/22] hw/vfio: add ramfb " Cédric Le Goater
2023-10-18 22:32 ` [PULL 00/22] vfio queue Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231018094531.733211-10-clg@redhat.com \
    --to=clg@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=mjrosato@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yi.l.liu@intel.com \
    --cc=zhenzhong.duan@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).