SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s390x/css: Make S390CCWDeviceClass::realize return bool

Browse Source 
Since the realize() handler of S390CCWDeviceClass takes an 'Error **'
argument, best practices suggest to return a bool. See the api/error.h
Rules section. While at it, modify the call in vfio_ccw_realize().

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-5-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:04 +02:00 committed by Thomas Huth
parent 19a1740fd3
commit 45f4218784
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ static bool s390_ccw_get_dev_info(S390CCWDevice *cdev,
return true; return true;
} }
static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp) static bool s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp)
{ {
CcwDevice *ccw_dev = CCW_DEVICE(cdev); CcwDevice *ccw_dev = CCW_DEVICE(cdev);
CCWDeviceClass *ck = CCW_DEVICE_GET_CLASS(ccw_dev); CCWDeviceClass *ck = CCW_DEVICE_GET_CLASS(ccw_dev);
@ -117,7 +117,7 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp)
int ret; int ret;
if (!s390_ccw_get_dev_info(cdev, sysfsdev, errp)) { if (!s390_ccw_get_dev_info(cdev, sysfsdev, errp)) {
return; return false;
} }
sch = css_create_sch(ccw_dev->devno, errp); sch = css_create_sch(ccw_dev->devno, errp);
@ -142,7 +142,7 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp)
css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid, css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid,
parent->hotplugged, 1); parent->hotplugged, 1);
return; return true;
out_err: out_err:
css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NULL); css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NULL);
@ -150,6 +150,7 @@ out_err:
g_free(sch); g_free(sch);
out_mdevid_free: out_mdevid_free:
g_free(cdev->mdevid); g_free(cdev->mdevid);
return false;
} }
static void s390_ccw_unrealize(S390CCWDevice *cdev) static void s390_ccw_unrealize(S390CCWDevice *cdev)

3
hw/vfio/ccw.c
View File

@ -582,8 +582,7 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp)
/* Call the class init function for subchannel. */ /* Call the class init function for subchannel. */
if (cdc->realize) { if (cdc->realize) {
cdc->realize(cdev, vcdev->vdev.sysfsdev, &err); if (!cdc->realize(cdev, vcdev->vdev.sysfsdev, &err)) {
if (err) {
goto out_err_propagate; goto out_err_propagate;
} }
} }

2
include/hw/s390x/s390-ccw.h
View File

@ -31,7 +31,7 @@ struct S390CCWDevice {
struct S390CCWDeviceClass { struct S390CCWDeviceClass {
CCWDeviceClass parent_class; CCWDeviceClass parent_class;
void (*realize)(S390CCWDevice *dev, char *sysfsdev, Error **errp); bool (*realize)(S390CCWDevice *dev, char *sysfsdev, Error **errp);
void (*unrealize)(S390CCWDevice *dev); void (*unrealize)(S390CCWDevice *dev);
IOInstEnding (*handle_request) (SubchDev *sch); IOInstEnding (*handle_request) (SubchDev *sch);
int (*handle_halt) (SubchDev *sch); int (*handle_halt) (SubchDev *sch);