diff options
author | Cédric Le Goater <clg@redhat.com> | 2024-05-22 19:01:02 +0200 |
---|---|---|
committer | Thomas Huth <thuth@redhat.com> | 2024-06-24 08:03:33 +0200 |
commit | 4a6a90f30fa3b2973bbb6faf985466b4338f903f (patch) | |
tree | 6d900fb383f5d5fa8149609121b15acbc937e44c /hw/s390x | |
parent | 9bf21277c4edabaef3346e2cb566040331fbc6e3 (diff) | |
download | qemu-4a6a90f30fa3b2973bbb6faf985466b4338f903f.zip qemu-4a6a90f30fa3b2973bbb6faf985466b4338f903f.tar.gz qemu-4a6a90f30fa3b2973bbb6faf985466b4338f903f.tar.bz2 |
s390x/css: Make CCWDeviceClass::realize return bool
Since the realize() handler of CCWDeviceClass 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 s390_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-3-clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/s390x')
-rw-r--r-- | hw/s390x/ccw-device.c | 3 | ||||
-rw-r--r-- | hw/s390x/ccw-device.h | 2 | ||||
-rw-r--r-- | hw/s390x/s390-ccw.c | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index fb8c1ac..a7d682e 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -31,9 +31,10 @@ static void ccw_device_refill_ids(CcwDevice *dev) dev->subch_id.valid = true; } -static void ccw_device_realize(CcwDevice *dev, Error **errp) +static bool ccw_device_realize(CcwDevice *dev, Error **errp) { ccw_device_refill_ids(dev); + return true; } static Property ccw_device_properties[] = { diff --git a/hw/s390x/ccw-device.h b/hw/s390x/ccw-device.h index 6dff952..5feeb0e 100644 --- a/hw/s390x/ccw-device.h +++ b/hw/s390x/ccw-device.h @@ -36,7 +36,7 @@ extern const VMStateDescription vmstate_ccw_dev; struct CCWDeviceClass { DeviceClass parent_class; void (*unplug)(HotplugHandler *, DeviceState *, Error **); - void (*realize)(CcwDevice *, Error **); + bool (*realize)(CcwDevice *, Error **); void (*refill_ids)(CcwDevice *); }; diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c index a06e91d..4b8ede7 100644 --- a/hw/s390x/s390-ccw.c +++ b/hw/s390x/s390-ccw.c @@ -137,8 +137,7 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp) goto out_err; } - ck->realize(ccw_dev, &err); - if (err) { + if (!ck->realize(ccw_dev, &err)) { goto out_err; } |