motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 14:02:05 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/vfio/ap: drop local_err from vfio_ap_realize

Browse source 
No reason for local_err here, use errp directly instead.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20191205174635.18758-21-vsementsov@virtuozzo.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-12-05 20:46:34 +03:00 • committed by Markus Armbruster
parent 7dc75edb03
commit b5e45b0f48
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hw/vfio/ap.c
View file

@ -89,14 +89,13 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
{ {
int ret; int ret;
char *mdevid; char *mdevid;
Error *local_err = NULL;
VFIOGroup *vfio_group; VFIOGroup *vfio_group;
APDevice *apdev = AP_DEVICE(dev); APDevice *apdev = AP_DEVICE(dev);
VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev); 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) { if (!vfio_group) {
goto out_err; return;
} }
vapdev->vdev.ops = &vfio_ap_ops; vapdev->vdev.ops = &vfio_ap_ops;
@ -113,7 +112,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
*/ */
vapdev->vdev.balloon_allowed = true; 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) { if (ret) {
goto out_get_dev_err; goto out_get_dev_err;
} }
@ -123,8 +122,6 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
out_get_dev_err: out_get_dev_err:
vfio_ap_put_device(vapdev); vfio_ap_put_device(vapdev);
vfio_put_group(vfio_group); vfio_put_group(vfio_group);
out_err:
error_propagate(errp, local_err);
} }
static void vfio_ap_unrealize(DeviceState *dev, Error **errp) static void vfio_ap_unrealize(DeviceState *dev, Error **errp)