vmbus: Switch bus reset to 3-phase-reset

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: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Cédric Le Goater <clg@redhat.com>
Acked-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
Tested-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Message-id: 20240119163512.3810301-3-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-01-19 16:35:09 +00:00
parent e6c03989af
commit d7f3552928
1 changed files with 4 additions and 3 deletions

View File

@ -2453,9 +2453,9 @@ static void vmbus_unrealize(BusState *bus)
qemu_mutex_destroy(&vmbus->rx_queue_lock); 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) 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) static void vmbus_class_init(ObjectClass *klass, void *data)
{ {
BusClass *k = BUS_CLASS(klass); BusClass *k = BUS_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
k->get_dev_path = vmbus_get_dev_path; k->get_dev_path = vmbus_get_dev_path;
k->get_fw_dev_path = vmbus_get_fw_dev_path; k->get_fw_dev_path = vmbus_get_fw_dev_path;
k->realize = vmbus_realize; k->realize = vmbus_realize;
k->unrealize = vmbus_unrealize; k->unrealize = vmbus_unrealize;
k->reset = vmbus_reset; rc->phases.hold = vmbus_reset_hold;
} }
static int vmbus_pre_load(void *opaque) static int vmbus_pre_load(void *opaque)