[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 34/35] hw/vfio/ap: drop local_err from vfio_ap_realize
From: |
Markus Armbruster |
Subject: |
[PULL v2 34/35] hw/vfio/ap: drop local_err from vfio_ap_realize |
Date: |
Wed, 18 Dec 2019 09:17:20 +0100 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
No reason for local_err here, use errp directly instead.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/vfio/ap.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index da6a20669d..8fbaa724c2 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -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)
--
2.21.0
- [PULL v2 35/35] nbd: assert that Error** is not NULL in nbd_iter_channel_error, (continued)
- [PULL v2 35/35] nbd: assert that Error** is not NULL in nbd_iter_channel_error, Markus Armbruster, 2019/12/18
- [PULL v2 29/35] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header, Markus Armbruster, 2019/12/18
- [PULL v2 32/35] include/qom/object.h: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 04/35] io: Fix Error usage in a comment <example>, Markus Armbruster, 2019/12/18
- [PULL v2 28/35] hw/s390x: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 33/35] backends/cryptodev: drop local_err from cryptodev_backend_complete(), Markus Armbruster, 2019/12/18
- [PULL v2 03/35] crypto: Fix typo in QCryptoTLSSession's <example> comment, Markus Armbruster, 2019/12/18
- [PULL v2 08/35] hw/core: Fix fit_load_fdt() error API violations, Markus Armbruster, 2019/12/18
- [PULL v2 12/35] error: Clean up unusual names of Error * variables, Markus Armbruster, 2019/12/18
- [PULL v2 17/35] hmp: drop Error pointer indirection in hmp_handle_error, Markus Armbruster, 2019/12/18
- [PULL v2 34/35] hw/vfio/ap: drop local_err from vfio_ap_realize,
Markus Armbruster <=
- [PULL v2 09/35] hw/ipmi: Fix realize() error API violations, Markus Armbruster, 2019/12/18
- Re: [PULL v2 00/35] Error reporting patches for 2019-12-17, Peter Maydell, 2019/12/20