| Message ID | 20240119163512.3810301-3-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | buses: switch to 3-phase-reset | expand |
On 19.01.2024 17:35, Peter Maydell wrote: > Switch vmbus 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> > --- Acked-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com> Thanks, Maciej
On Fri, Jan 19, 2024 at 04:35:09PM +0000, Peter Maydell wrote: > Date: Fri, 19 Jan 2024 16:35:09 +0000 > From: Peter Maydell <peter.maydell@linaro.org> > Subject: [PATCH 2/5] vmbus: Switch bus reset to 3-phase-reset > X-Mailer: git-send-email 2.34.1 > > Switch vmbus 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/hyperv/vmbus.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com> > > diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c > index c86d1895bae..380239af2c7 100644 > --- a/hw/hyperv/vmbus.c > +++ b/hw/hyperv/vmbus.c > @@ -2453,9 +2453,9 @@ static void vmbus_unrealize(BusState *bus) > qemu_mutex_destroy(&vmbus->rx_queue_lock); > } > > -static void vmbus_reset(BusState *bus) > +static void vmbus_reset_hold(Object *obj) > { > - vmbus_deinit(VMBUS(bus)); > + vmbus_deinit(VMBUS(obj)); > } > > static char *vmbus_get_dev_path(DeviceState *dev) > @@ -2476,12 +2476,13 @@ static char *vmbus_get_fw_dev_path(DeviceState *dev) > static void vmbus_class_init(ObjectClass *klass, void *data) > { > BusClass *k = BUS_CLASS(klass); > + ResettableClass *rc = RESETTABLE_CLASS(klass); > > k->get_dev_path = vmbus_get_dev_path; > k->get_fw_dev_path = vmbus_get_fw_dev_path; > k->realize = vmbus_realize; > k->unrealize = vmbus_unrealize; > - k->reset = vmbus_reset; > + rc->phases.hold = vmbus_reset_hold; > } > > static int vmbus_pre_load(void *opaque) > -- > 2.34.1 > >
diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index c86d1895bae..380239af2c7 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -2453,9 +2453,9 @@ static void vmbus_unrealize(BusState *bus) qemu_mutex_destroy(&vmbus->rx_queue_lock); } -static void vmbus_reset(BusState *bus) +static void vmbus_reset_hold(Object *obj) { - vmbus_deinit(VMBUS(bus)); + vmbus_deinit(VMBUS(obj)); } static char *vmbus_get_dev_path(DeviceState *dev) @@ -2476,12 +2476,13 @@ static char *vmbus_get_fw_dev_path(DeviceState *dev) static void vmbus_class_init(ObjectClass *klass, void *data) { BusClass *k = BUS_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); k->get_dev_path = vmbus_get_dev_path; k->get_fw_dev_path = vmbus_get_fw_dev_path; k->realize = vmbus_realize; k->unrealize = vmbus_unrealize; - k->reset = vmbus_reset; + rc->phases.hold = vmbus_reset_hold; } static int vmbus_pre_load(void *opaque)
Switch vmbus 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/hyperv/vmbus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)