mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
vfio/iommufd: add vfio_device_free_name
Define vfio_device_free_name to free the name created by vfio_device_get_name. A subsequent patch will do more there. No functional change. Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com> Link: https://lore.kernel.org/qemu-devel/1751493538-202042-11-git-send-email-steven.sistare@oracle.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
committed by
Cédric Le Goater
parent
b9b389b9e0
commit
184053f04f
+2
-2
@@ -265,7 +265,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
|
||||
|
||||
error:
|
||||
error_prepend(errp, VFIO_MSG_PREFIX, vbasedev->name);
|
||||
g_free(vbasedev->name);
|
||||
vfio_device_free_name(vbasedev);
|
||||
}
|
||||
|
||||
static void vfio_ap_unrealize(DeviceState *dev)
|
||||
@@ -275,7 +275,7 @@ static void vfio_ap_unrealize(DeviceState *dev)
|
||||
vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX);
|
||||
vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_CFG_CHG_IRQ_INDEX);
|
||||
vfio_device_detach(&vapdev->vdev);
|
||||
g_free(vapdev->vdev.name);
|
||||
vfio_device_free_name(&vapdev->vdev);
|
||||
}
|
||||
|
||||
static const Property vfio_ap_properties[] = {
|
||||
|
||||
+2
-2
@@ -619,7 +619,7 @@ out_io_notifier_err:
|
||||
out_region_err:
|
||||
vfio_device_detach(vbasedev);
|
||||
out_attach_dev_err:
|
||||
g_free(vbasedev->name);
|
||||
vfio_device_free_name(vbasedev);
|
||||
out_unrealize:
|
||||
if (cdc->unrealize) {
|
||||
cdc->unrealize(cdev);
|
||||
@@ -637,7 +637,7 @@ static void vfio_ccw_unrealize(DeviceState *dev)
|
||||
vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX);
|
||||
vfio_ccw_put_region(vcdev);
|
||||
vfio_device_detach(&vcdev->vdev);
|
||||
g_free(vcdev->vdev.name);
|
||||
vfio_device_free_name(&vcdev->vdev);
|
||||
|
||||
if (cdc->unrealize) {
|
||||
cdc->unrealize(cdev);
|
||||
|
||||
@@ -333,6 +333,11 @@ bool vfio_device_get_name(VFIODevice *vbasedev, Error **errp)
|
||||
return true;
|
||||
}
|
||||
|
||||
void vfio_device_free_name(VFIODevice *vbasedev)
|
||||
{
|
||||
g_clear_pointer(&vbasedev->name, g_free);
|
||||
}
|
||||
|
||||
void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp)
|
||||
{
|
||||
ERRP_GUARD();
|
||||
|
||||
+1
-1
@@ -2996,7 +2996,7 @@ void vfio_pci_put_device(VFIOPCIDevice *vdev)
|
||||
|
||||
vfio_device_detach(&vdev->vbasedev);
|
||||
|
||||
g_free(vdev->vbasedev.name);
|
||||
vfio_device_free_name(&vdev->vbasedev);
|
||||
g_free(vdev->msix);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -530,7 +530,7 @@ static bool vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
|
||||
{
|
||||
/* @fd takes precedence over @sysfsdev which takes precedence over @host */
|
||||
if (vbasedev->fd < 0 && vbasedev->sysfsdev) {
|
||||
g_free(vbasedev->name);
|
||||
vfio_device_free_name(vbasedev);
|
||||
vbasedev->name = g_path_get_basename(vbasedev->sysfsdev);
|
||||
} else if (vbasedev->fd < 0) {
|
||||
if (!vbasedev->name || strchr(vbasedev->name, '/')) {
|
||||
|
||||
@@ -279,6 +279,7 @@ int vfio_device_get_irq_info(VFIODevice *vbasedev, int index,
|
||||
|
||||
/* Returns 0 on success, or a negative errno. */
|
||||
bool vfio_device_get_name(VFIODevice *vbasedev, Error **errp);
|
||||
void vfio_device_free_name(VFIODevice *vbasedev);
|
||||
void vfio_device_set_fd(VFIODevice *vbasedev, const char *str, Error **errp);
|
||||
void vfio_device_init(VFIODevice *vbasedev, int type, VFIODeviceOps *ops,
|
||||
DeviceState *dev, bool ram_discard);
|
||||
|
||||
Reference in New Issue
Block a user