| Message ID | 20240830145812.1967042-2-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | s390: Convert virtio-ccw, cpu to three-phase reset, and followup cleanup | expand |
On Fri, 2024-08-30 at 15:58 +0100, Peter Maydell wrote: > Convert the TYPE_CCW_DEVICE to three-phase reset. This is a > device class which is subclassed, so it needs to be three-phase > before we can convert the subclass. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com> > --- > hw/s390x/ccw-device.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c > index a7d682e5af9..14c24e38904 100644 > --- a/hw/s390x/ccw-device.c > +++ b/hw/s390x/ccw-device.c > @@ -44,9 +44,9 @@ static Property ccw_device_properties[] = { > DEFINE_PROP_END_OF_LIST(), > }; > > -static void ccw_device_reset(DeviceState *d) > +static void ccw_device_reset_hold(Object *obj, ResetType type) > { > - CcwDevice *ccw_dev = CCW_DEVICE(d); > + CcwDevice *ccw_dev = CCW_DEVICE(obj); > > css_reset_sch(ccw_dev->sch); > } > @@ -55,11 +55,12 @@ static void ccw_device_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > CCWDeviceClass *k = CCW_DEVICE_CLASS(klass); > + ResettableClass *rc = RESETTABLE_CLASS(klass); > > k->realize = ccw_device_realize; > k->refill_ids = ccw_device_refill_ids; > device_class_set_props(dc, ccw_device_properties); > - dc->reset = ccw_device_reset; > + rc->phases.hold = ccw_device_reset_hold; > dc->bus_type = TYPE_VIRTUAL_CSS_BUS; > } >
On 30/8/24 16:58, Peter Maydell wrote: > Convert the TYPE_CCW_DEVICE to three-phase reset. This is a > device class which is subclassed, so it needs to be three-phase > before we can convert the subclass. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/s390x/ccw-device.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 30/08/2024 16.58, Peter Maydell wrote: > Convert the TYPE_CCW_DEVICE to three-phase reset. This is a > device class which is subclassed, so it needs to be three-phase > before we can convert the subclass. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/s390x/ccw-device.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Acked-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index a7d682e5af9..14c24e38904 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -44,9 +44,9 @@ static Property ccw_device_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static void ccw_device_reset(DeviceState *d) +static void ccw_device_reset_hold(Object *obj, ResetType type) { - CcwDevice *ccw_dev = CCW_DEVICE(d); + CcwDevice *ccw_dev = CCW_DEVICE(obj); css_reset_sch(ccw_dev->sch); } @@ -55,11 +55,12 @@ static void ccw_device_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); CCWDeviceClass *k = CCW_DEVICE_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); k->realize = ccw_device_realize; k->refill_ids = ccw_device_refill_ids; device_class_set_props(dc, ccw_device_properties); - dc->reset = ccw_device_reset; + rc->phases.hold = ccw_device_reset_hold; dc->bus_type = TYPE_VIRTUAL_CSS_BUS; }
Convert the TYPE_CCW_DEVICE to three-phase reset. This is a device class which is subclassed, so it needs to be three-phase before we can convert the subclass. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/s390x/ccw-device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)