On Fri, Jan 19, 2024 at 04:35:11PM +0000, Peter Maydell wrote:
> Date: Fri, 19 Jan 2024 16:35:11 +0000
> From: Peter Maydell <peter.mayd...@linaro.org>
> Subject: [PATCH 4/5] hw/s390x/css-bridge: switch virtual-css bus to
> 3-phase-reset
> X-Mailer: git-send-email 2.34.1
>
> Switch the s390x virtual-css bus from using BusClass::reset to the
> Resettable interface.
>
> This has no behavioural change, because the BusClass code to support
> subclasses that use the legacy BusClass::reset will call that method
> in the hold phase of 3-phase reset.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
> ---
> hw/s390x/css-bridge.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
Reviewed-by: Zhao Liu <zhao1....@intel.com>
>
> diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
> index 15d26efc951..34639f21435 100644
> --- a/hw/s390x/css-bridge.c
> +++ b/hw/s390x/css-bridge.c
> @@ -56,7 +56,7 @@ static void ccw_device_unplug(HotplugHandler *hotplug_dev,
> qdev_unrealize(dev);
> }
>
> -static void virtual_css_bus_reset(BusState *qbus)
> +static void virtual_css_bus_reset_hold(Object *obj)
> {
> /* This should actually be modelled via the generic css */
> css_reset();
> @@ -81,8 +81,9 @@ static char *virtual_css_bus_get_dev_path(DeviceState *dev)
> static void virtual_css_bus_class_init(ObjectClass *klass, void *data)
> {
> BusClass *k = BUS_CLASS(klass);
> + ResettableClass *rc = RESETTABLE_CLASS(klass);
>
> - k->reset = virtual_css_bus_reset;
> + rc->phases.hold = virtual_css_bus_reset_hold;
> k->get_dev_path = virtual_css_bus_get_dev_path;
> }
>
> --
> 2.34.1
>
>
