| Message ID | 20240425090214.400194-2-clg@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/4] vfio/ap: Use g_autofree variable in vfio_ap_register_irq_notifier() | expand |
Cédric Le Goater <clg@redhat.com> writes: > Signed-off-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
On 4/25/24 5:02 AM, Cédric Le Goater wrote: > Signed-off-by: Cédric Le Goater <clg@redhat.com> > --- > hw/vfio/ap.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) LGTM Reviewed-by: Anthony Krowiak <akrowiak@linux.ibm.com> > > diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c > index 7c4caa5938636937680fec87e999249ac84a4498..03f8ffaa5e2bf13cf8daa2f44aa4cf17809abd94 100644 > --- a/hw/vfio/ap.c > +++ b/hw/vfio/ap.c > @@ -77,7 +77,7 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, > size_t argsz; > IOHandler *fd_read; > EventNotifier *notifier; > - struct vfio_irq_info *irq_info; > + g_autofree struct vfio_irq_info *irq_info = NULL; > VFIODevice *vdev = &vapdev->vdev; > > switch (irq) { > @@ -104,14 +104,14 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, > if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, > irq_info) < 0 || irq_info->count < 1) { > error_setg_errno(errp, errno, "vfio: Error getting irq info"); > - goto out_free_info; > + return; > } > > if (event_notifier_init(notifier, 0)) { > error_setg_errno(errp, errno, > "vfio: Unable to init event notifier for irq (%d)", > irq); > - goto out_free_info; > + return; > } > > fd = event_notifier_get_fd(notifier); > @@ -122,10 +122,6 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, > qemu_set_fd_handler(fd, NULL, NULL, vapdev); > event_notifier_cleanup(notifier); > } > - > -out_free_info: > - g_free(irq_info); > - > } > > static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
Applied series to vfio-next. Thanks, C. On 4/25/24 11:02, Cédric Le Goater wrote: > Signed-off-by: Cédric Le Goater <clg@redhat.com> > --- > hw/vfio/ap.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c > index 7c4caa5938636937680fec87e999249ac84a4498..03f8ffaa5e2bf13cf8daa2f44aa4cf17809abd94 100644 > --- a/hw/vfio/ap.c > +++ b/hw/vfio/ap.c > @@ -77,7 +77,7 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, > size_t argsz; > IOHandler *fd_read; > EventNotifier *notifier; > - struct vfio_irq_info *irq_info; > + g_autofree struct vfio_irq_info *irq_info = NULL; > VFIODevice *vdev = &vapdev->vdev; > > switch (irq) { > @@ -104,14 +104,14 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, > if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, > irq_info) < 0 || irq_info->count < 1) { > error_setg_errno(errp, errno, "vfio: Error getting irq info"); > - goto out_free_info; > + return; > } > > if (event_notifier_init(notifier, 0)) { > error_setg_errno(errp, errno, > "vfio: Unable to init event notifier for irq (%d)", > irq); > - goto out_free_info; > + return; > } > > fd = event_notifier_get_fd(notifier); > @@ -122,10 +122,6 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, > qemu_set_fd_handler(fd, NULL, NULL, vapdev); > event_notifier_cleanup(notifier); > } > - > -out_free_info: > - g_free(irq_info); > - > } > > static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 7c4caa5938636937680fec87e999249ac84a4498..03f8ffaa5e2bf13cf8daa2f44aa4cf17809abd94 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -77,7 +77,7 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, size_t argsz; IOHandler *fd_read; EventNotifier *notifier; - struct vfio_irq_info *irq_info; + g_autofree struct vfio_irq_info *irq_info = NULL; VFIODevice *vdev = &vapdev->vdev; switch (irq) { @@ -104,14 +104,14 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, irq_info) < 0 || irq_info->count < 1) { error_setg_errno(errp, errno, "vfio: Error getting irq info"); - goto out_free_info; + return; } if (event_notifier_init(notifier, 0)) { error_setg_errno(errp, errno, "vfio: Unable to init event notifier for irq (%d)", irq); - goto out_free_info; + return; } fd = event_notifier_get_fd(notifier); @@ -122,10 +122,6 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev, qemu_set_fd_handler(fd, NULL, NULL, vapdev); event_notifier_cleanup(notifier); } - -out_free_info: - g_free(irq_info); - } static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
Signed-off-by: Cédric Le Goater <clg@redhat.com> --- hw/vfio/ap.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)