vfio/ccw: Use g_autofree variable
PATCH 1/1 vfio/ccw: Use g_autofree variable
Also change the return value of vfio_ccw_register_irq_notifier() to be a bool since it takes and 'Error **' argument. See the qapi/error.h Rules section.
--- hw/vfio/ccw.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)
hw/vfio/ccw.c +11 -14
@@ -379,12 +379,12 @@ read_err:css_inject_io_interrupt (sch); } -static void vfio_ccw_register_irq_notifier (VFIOCCWDevice *vcdev, +static bool vfio_ccw_register_irq_notifier (VFIOCCWDevice *vcdev,unsigned int irq,Error **errp) {VFIODevice *vdev = &vcdev->vdev; -struct vfio_irq_info *irq_info; + g_autofree struct vfio_irq_info *irq_info = NULL;size_t argsz;int fd;EventNotifier *notifier;
@@ -405,13 +405,13 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,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);
@@ -421,14 +421,14 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,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);
@@ -440,8 +440,7 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,event_notifier_cleanup (notifier); } -out_free_info: -g_free (irq_info); +return true; } static void vfio_ccw_unregister_irq_notifier(VFIOCCWDevice *vcdev,
@@ -605,20 +604,18 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp) goto out_region_err; } -vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_IO_IRQ_INDEX , &err); -if (err) { +if (!vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_IO_IRQ_INDEX , &err)) { goto out_io_notifier_err; }if (vcdev->crw_region) { -vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_CRW_IRQ_INDEX , &err); -if (err) { +if (!vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_CRW_IRQ_INDEX , + &err)) { goto out_irq_notifier_err; } } -vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_REQ_IRQ_INDEX , &err); -if (err) { +if (!vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_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 8 lines · Cédric Le Goater
Also change the return value of
vfio_ccw_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]>--- hw/vfio/ccw.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)
Quoted 5 lines · Cédric Le Goater
Also change the return value of
vfio_ccw_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]>
My comments on "[PATCH] vfio/ap: Use g_autofree variable" apply.
More inline.
Quoted 67 lines
--- hw/vfio/ccw.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)hw/vfio/ccw.c +7
-8@@ -379,12 +379,12 @@ read_err:css_inject_io_interrupt (sch); } -static void vfio_ccw_register_irq_notifier (VFIOCCWDevice *vcdev, +static bool vfio_ccw_register_irq_notifier (VFIOCCWDevice *vcdev,unsigned int irq,Error **errp) {VFIODevice *vdev = &vcdev->vdev; -struct vfio_irq_info *irq_info; + g_autofree struct vfio_irq_info *irq_info = NULL;size_t argsz;int fd;EventNotifier *notifier;@@ -405,13 +405,13 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,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);@@ -421,14 +421,14 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,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);@@ -440,8 +440,7 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,event_notifier_cleanup (notifier); } -out_free_info: -g_free (irq_info); +return true; } static void vfio_ccw_unregister_irq_notifier(VFIOCCWDevice *vcdev,
hw/vfio/ccw.c static void vfio_ccw_realize(DeviceState *dev, Error **errp) · line 607
Quoted 6 lines
hw/vfio/ccw.c +1
-2@@ -605,20 +604,18 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp) goto out_region_err; } -vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_IO_IRQ_INDEX , &err); -if (err) { +if (!vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_IO_IRQ_INDEX , &err)) {
Please pass errp instead of &err.
hw/vfio/ccw.c static void vfio_ccw_realize(DeviceState *dev, Error **errp) · line 613
Quoted 8 lines
hw/vfio/ccw.c +2
-2goto out_io_notifier_err; }if (vcdev->crw_region) { -vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_CRW_IRQ_INDEX , &err); -if (err) { +if (!vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_CRW_IRQ_INDEX , + &err)) {
Likewise.
hw/vfio/ccw.c static void vfio_ccw_realize(DeviceState *dev, Error **errp) · line 621
Quoted 10 lines
hw/vfio/ccw.c +1
-2goto out_irq_notifier_err; } } -vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_REQ_IRQ_INDEX , &err); -if (err) { +if (!vfio_ccw_register_irq_notifier (vcdev,VFIO_CCW_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.