ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/s390x/ccw: Remove local Error variable from s390_ccw_realize() 

Use the 'Error **errp' argument of s390_ccw_realize() instead and
remove the error_propagate() call.

Signed-off-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Anthony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240522170107.289532-4-clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Cédric Le Goater 2024-05-22 19:01:03 +02:00 committed by Thomas Huth
parent 4a6a90f30f
commit 19a1740fd3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/s390x/s390-ccw.c
View File

@ -115,13 +115,12 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp)
DeviceState *parent = DEVICE(ccw_dev); DeviceState *parent = DEVICE(ccw_dev);
SubchDev *sch; SubchDev *sch;
int ret; int ret;
Error *err = NULL;
if (!s390_ccw_get_dev_info(cdev, sysfsdev, &err)) { if (!s390_ccw_get_dev_info(cdev, sysfsdev, errp)) {
goto out_err_propagate; return;
} }
sch = css_create_sch(ccw_dev->devno, &err); sch = css_create_sch(ccw_dev->devno, errp);
if (!sch) { if (!sch) {
goto out_mdevid_free; goto out_mdevid_free;
} }
@ -132,12 +131,12 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp)
ccw_dev->sch = sch; ccw_dev->sch = sch;
ret = css_sch_build_schib(sch, &cdev->hostid); ret = css_sch_build_schib(sch, &cdev->hostid);
if (ret) { if (ret) {
error_setg_errno(&err, -ret, "%s: Failed to build initial schib", error_setg_errno(errp, -ret, "%s: Failed to build initial schib",
__func__); __func__);
goto out_err; goto out_err;
} }
if (!ck->realize(ccw_dev, &err)) { if (!ck->realize(ccw_dev, errp)) {
goto out_err; goto out_err;
} }
@ -151,8 +150,6 @@ out_err:
g_free(sch); g_free(sch);
out_mdevid_free: out_mdevid_free:
g_free(cdev->mdevid); g_free(cdev->mdevid);
out_err_propagate:
error_propagate(errp, err);
} }
static void s390_ccw_unrealize(S390CCWDevice *cdev) static void s390_ccw_unrealize(S390CCWDevice *cdev)