vfio/ap: Use g_autofree variable
PATCH 1/1 vfio/ap: Use g_autofree variable
Also change the return value of vfio_ap_register_irq_notifier() to be a bool since it takes and 'Error **' argument. See the qapi/error.h Rules section.
--- hw/vfio/ap.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
hw/vfio/ap.c +8 -11
@@ -70,14 +70,14 @@ static void vfio_ap_req_notifier_handler(void *opaque) } } -static void vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev, +static bool vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev,unsigned int irq,Error **errp) {int fd;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) {
@@ -87,13 +87,13 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,break ;default :error_setg (errp,"vfio: Unsupported device irq(%d)" , irq); -return ; +return false; }if (vdev->num_irqs < irq +1 ) {error_setg (errp,"vfio: IRQ %u not available (number of irqs %u)" , irq, vdev->num_irqs); -return ; +return false; } argsz =sizeof (*irq_info);
@@ -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 false; }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 false; } fd =event_notifier_get_fd (notifier);
@@ -123,9 +123,7 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,event_notifier_cleanup (notifier); } -out_free_info: -g_free (irq_info); - +return true; } static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
@@ -171,8 +169,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) goto error; } -vfio_ap_register_irq_notifier (vapdev,VFIO_AP_REQ_IRQ_INDEX , &err); -if (err) { +if (!vfio_ap_register_irq_notifier (vapdev,VFIO_AP_REQ_IRQ_INDEX , &err)) {/* * Report this error, but do not make it a failing condition. * Lack of this IRQ in the host does not prevent normal operation.
Signature · 1 line
2.44.0
Quoted 5 lines · Cédric Le Goater
Also change the return value of
vfio_ap_register_irq_notifier()to be a bool since it takes and 'Error **' argument. See theqapi/error.hRules section.Signed-off-by Cédric Le Goater <[email protected]>
Split the patch?
If not, the bigger part by far is the return value change, so I'd put that into the subject.
Quoted 70 lines
--- hw/vfio/ap.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)hw/vfio/ap.c +7
-9@@ -70,14 +70,14 @@ static void vfio_ap_req_notifier_handler(void *opaque) } } -static void vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev, +static bool vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev,unsigned int irq,Error **errp) {int fd;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) {@@ -87,13 +87,13 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,break ;default :error_setg (errp,"vfio: Unsupported device irq(%d)" , irq); -return ; +return false; }if (vdev->num_irqs < irq +1 ) {error_setg (errp,"vfio: IRQ %u not available (number of irqs %u)" , irq, vdev->num_irqs); -return ; +return false; } argsz =sizeof (*irq_info);@@ -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 false; }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 false; } fd =event_notifier_get_fd (notifier);@@ -123,9 +123,7 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,event_notifier_cleanup (notifier); } -out_free_info: -g_free (irq_info); - +return true; } static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
hw/vfio/ap.c static void vfio_ap_realize(DeviceState *dev, Error **errp) · line 175
Quoted 9 lines
hw/vfio/ap.c +1
-2@@ -171,8 +169,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) goto error; } -vfio_ap_register_irq_notifier (vapdev,VFIO_AP_REQ_IRQ_INDEX , &err); -if (err) { +if (!vfio_ap_register_irq_notifier (vapdev,VFIO_AP_REQ_IRQ_INDEX , &err)) {/* * Report this error, but do not make it a failing condition. * Lack of this IRQ in the host does not prevent normal operation.
*/
error_report_err(err);Not this patch's problem, but here goes anyway: since this isn't an error, we shouldn't use error_report_err(). Would warn_report_err() be appropriate? info_report_err() doesn't exist, but it could.
}
return;Quoted 3 lines · Cédric Le Goater
Also change the return value of
vfio_ap_register_irq_notifier()to be a bool since it takes and 'Error **' argument. See theqapi/error.hRules section.
LGTM
Quoted 81 lines
Signed-off-by Cédric Le Goater <[email protected]>--- hw/vfio/ap.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)hw/vfio/ap.c +8
-11@@ -70,14 +70,14 @@ static void vfio_ap_req_notifier_handler(void *opaque) } } -static void vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev, +static bool vfio_ap_register_irq_notifier (VFIOAPDevice *vapdev,unsigned int irq,Error **errp) {int fd;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) {@@ -87,13 +87,13 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,break ;default :error_setg (errp,"vfio: Unsupported device irq(%d)" , irq); -return ; +return false; }if (vdev->num_irqs < irq +1 ) {error_setg (errp,"vfio: IRQ %u not available (number of irqs %u)" , irq, vdev->num_irqs); -return ; +return false; } argsz =sizeof (*irq_info);@@ -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 false; }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 false; } fd =event_notifier_get_fd (notifier);@@ -123,9 +123,7 @@ static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,event_notifier_cleanup (notifier); } -out_free_info: -g_free (irq_info); - +return true; } static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,@@ -171,8 +169,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) goto error; } -vfio_ap_register_irq_notifier (vapdev,VFIO_AP_REQ_IRQ_INDEX , &err); -if (err) { +if (!vfio_ap_register_irq_notifier (vapdev,VFIO_AP_REQ_IRQ_INDEX , &err)) {/* * Report this error, but do not make it a failing condition. * Lack of this IRQ in the host does not prevent normal operation.