mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfio/ap: Use vfio_[attach/detach]_device

Browse Source 
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>
This commit is contained in:
Eric Auger 2023-10-09 11:09:11 +02:00 committed by Cédric Le Goater
parent da5ed43299
commit c95d128ee3
1 changed files with 13 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
hw/vfio/ap.c
View File

@ -53,40 +53,6 @@ struct VFIODeviceOps vfio_ap_ops = {
.vfio_compute_needs_reset = vfio_ap_compute_needs_reset, .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) static void vfio_ap_req_notifier_handler(void *opaque)
{ {
VFIOAPDevice *vapdev = 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) static void vfio_ap_realize(DeviceState *dev, Error **errp)
{ {
int ret; int ret;
char *mdevid;
Error *err = NULL; Error *err = NULL;
VFIOGroup *vfio_group;
APDevice *apdev = AP_DEVICE(dev); APDevice *apdev = AP_DEVICE(dev);
VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev); VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev);
VFIODevice *vbasedev = &vapdev->vdev;
vfio_group = vfio_ap_get_group(vapdev, errp); vbasedev->name = g_path_get_basename(vbasedev->sysfsdev);
if (!vfio_group) { vbasedev->ops = &vfio_ap_ops;
return; vbasedev->type = VFIO_DEVICE_TYPE_AP;
} vbasedev->dev = dev;
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;
/* /*
* vfio-ap devices operate in a way compatible with discarding of * 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; 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) { if (ret) {
goto out_get_dev_err; goto error;
} }
vfio_ap_register_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX, &err); 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; return;
out_get_dev_err: error:
vfio_ap_put_device(vapdev); error_prepend(errp, VFIO_MSG_PREFIX, vbasedev->name);
vfio_put_group(vfio_group); g_free(vbasedev->name);
} }
static void vfio_ap_unrealize(DeviceState *dev) static void vfio_ap_unrealize(DeviceState *dev)
{ {
APDevice *apdev = AP_DEVICE(dev); APDevice *apdev = AP_DEVICE(dev);
VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev); VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev);
VFIOGroup *group = vapdev->vdev.group;
vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX); vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX);
vfio_ap_put_device(vapdev); vfio_detach_device(&vapdev->vdev);
vfio_put_group(group); g_free(vapdev->vdev.name);
} }
static Property vfio_ap_properties[] = { static Property vfio_ap_properties[] = {