[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/5] hw/s390x/css-bridge: switch virtual-css bus to 3-phase-reset
From: |
Peter Maydell |
Subject: |
[PATCH 4/5] hw/s390x/css-bridge: switch virtual-css bus to 3-phase-reset |
Date: |
Fri, 19 Jan 2024 16:35:11 +0000 |
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.maydell@linaro.org>
---
hw/s390x/css-bridge.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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
- [PATCH 1/5] pci: Switch bus reset to 3-phase-reset, (continued)
- [PATCH 1/5] pci: Switch bus reset to 3-phase-reset, Peter Maydell, 2024/01/19
- [PATCH 5/5] hw/core: Remove transitional infrastructure from BusClass, Peter Maydell, 2024/01/19
- [PATCH 2/5] vmbus: Switch bus reset to 3-phase-reset, Peter Maydell, 2024/01/19
- [PATCH 3/5] adb: Switch bus reset to 3-phase-reset, Peter Maydell, 2024/01/19
- [PATCH 4/5] hw/s390x/css-bridge: switch virtual-css bus to 3-phase-reset,
Peter Maydell <=
- Re: [PATCH 0/5] buses: switch to 3-phase-reset, Michael S. Tsirkin, 2024/01/21
- Re: [PATCH 0/5] buses: switch to 3-phase-reset, Peter Xu, 2024/01/21