On Tue, 2025-06-10 at 08:39 -0700, Steve Sistare wrote:
> 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.sist...@oracle.com>
> ---
> include/hw/vfio/vfio-device.h | 1 +
> hw/vfio/ap.c | 2 +-
> hw/vfio/ccw.c | 2 +-
> hw/vfio/device.c | 5 +++++
> hw/vfio/pci.c | 2 +-
> hw/vfio/platform.c | 2 +-
> 6 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/include/hw/vfio/vfio-device.h b/include/hw/vfio/vfio-device.h
> index 6eb6f21..321b442 100644
> --- a/include/hw/vfio/vfio-device.h
> +++ b/include/hw/vfio/vfio-device.h
> @@ -227,6 +227,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);
> diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
> index 785c0a0..013bd59 100644
> --- a/hw/vfio/ap.c
> +++ b/hw/vfio/ap.c
> @@ -180,7 +180,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)
^^^
I suspect you want to convert the g_free call of the VFIODevice name here as
well.
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index cea9d6e..903b8b0 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -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);
Similarly, the matching g_free call in vfio_ccw_unrealize
Thanks,
Eric
