hw/vfio/ap: drop local_err from vfio_ap_realize
PATCH v6 1/1 hw/vfio/ap: drop local_err from vfio_ap_realize
No reason for local_err here, use errp directly instead.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
---
v6: keep return code checking [Cornelia]
hw/vfio/ap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
hw/vfio/ap.c +3 -6
@@ -89,14 +89,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) {int ret;char *mdevid; -Error *local_err =NULL ;VFIOGroup *vfio_group;APDevice *apdev =AP_DEVICE (dev);VFIOAPDevice *vapdev =VFIO_AP_DEVICE (apdev); - vfio_group =vfio_ap_get_group (vapdev, &local_err); + vfio_group =vfio_ap_get_group (vapdev, errp);if (!vfio_group) { - goto out_err; +return ; } vapdev->vdev.ops = &vfio_ap_ops;
@@ -113,7 +112,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)*/ vapdev->vdev.balloon_allowed = true; - ret =vfio_get_device (vfio_group, mdevid, &vapdev->vdev, &local_err); + ret =vfio_get_device (vfio_group, mdevid, &vapdev->vdev, errp);if (ret) { goto out_get_dev_err; }
@@ -123,8 +122,6 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp) out_get_dev_err:vfio_ap_put_device (vapdev);vfio_put_group (vfio_group); -out_err: -error_propagate (errp, local_err); }static void vfio_ap_unrealize (DeviceState *dev,Error **errp)
Signature · 1 line
2.21.0
Quoted 3 lines · Vladimir Sementsov-Ogievskiy
No reason for
local_errhere, use errp directly instead.Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Reviewed-by Markus Armbruster <[email protected]>