ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw: Remove device_phases_reset() 

Currently we have transitional machinery between legacy reset
and three phase reset that works in two directions:
 * if you invoke three phase reset on a device which has set
   the DeviceClass::legacy_reset method, we detect this in
   device_get_transitional_reset() and arrange that we call
   the legacy_reset method during the hold phase of reset
 * if you invoke legacy reset on a device which implements
   three phase reset, the default legacy_reset method is
   device_phases_reset(), which does a three-phase reset
   of the device

However, we have now eliminated all the places which could invoke
legacy reset on a device, which means that the function
device_phases_reset() is never called -- it serves only as the value
of DeviceClass::legacy_reset that indicates that the subclass never
overrode the legacy reset method.  So we can delete it, and instead
check for legacy_reset != NULL.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20240830145812.1967042-10-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-09-13 15:31:45 +01:00
parent 1000872dde
commit b5fe9bf296
1 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
hw/core/qdev.c
View File

@ -747,39 +747,17 @@ device_vmstate_if_get_id(VMStateIf *obj)
return qdev_get_dev_path(dev); return qdev_get_dev_path(dev);
} }
/**
* device_phases_reset:
* Transition reset method for devices to allow moving
* smoothly from legacy reset method to multi-phases
*/
static void device_phases_reset(DeviceState *dev)
{
ResettableClass *rc = RESETTABLE_GET_CLASS(dev);
if (rc->phases.enter) {
rc->phases.enter(OBJECT(dev), RESET_TYPE_COLD);
}
if (rc->phases.hold) {
rc->phases.hold(OBJECT(dev), RESET_TYPE_COLD);
}
if (rc->phases.exit) {
rc->phases.exit(OBJECT(dev), RESET_TYPE_COLD);
}
}
static void device_transitional_reset(Object *obj) static void device_transitional_reset(Object *obj)
{ {
DeviceClass *dc = DEVICE_GET_CLASS(obj); DeviceClass *dc = DEVICE_GET_CLASS(obj);
/* /*
* This will call either @device_phases_reset (for multi-phases transitioned * Device still using DeviceClass legacy_reset method. This doesn't
* devices) or a device's specific method for not-yet transitioned devices. * reset children. device_get_transitional_reset() checked that
* In both case, it does not reset children. * this isn't NULL.
*/ */
if (dc->legacy_reset) {
dc->legacy_reset(DEVICE(obj)); dc->legacy_reset(DEVICE(obj));
} }
}
/** /**
* device_get_transitional_reset: * device_get_transitional_reset:
@ -788,7 +766,7 @@ static void device_transitional_reset(Object *obj)
static ResettableTrFunction device_get_transitional_reset(Object *obj) static ResettableTrFunction device_get_transitional_reset(Object *obj)
{ {
DeviceClass *dc = DEVICE_GET_CLASS(obj); DeviceClass *dc = DEVICE_GET_CLASS(obj);
if (dc->legacy_reset != device_phases_reset) { if (dc->legacy_reset) {
/* /*
* dc->reset has been overridden by a subclass, * dc->reset has been overridden by a subclass,
* the device is not ready for multi phase yet. * the device is not ready for multi phase yet.
@ -819,19 +797,14 @@ static void device_class_init(ObjectClass *class, void *data)
rc->child_foreach = device_reset_child_foreach; rc->child_foreach = device_reset_child_foreach;
/* /*
* @device_phases_reset is put as the default reset method below, allowing * A NULL legacy_reset implies a three-phase reset device. Devices can
* to do the multi-phase transition from base classes to leaf classes. It * only be reset using three-phase aware mechanisms, but we still support
* allows a legacy-reset Device class to extend a multi-phases-reset * for transitional purposes leaf classes which set the old legacy_reset
* Device class for the following reason: * method via device_class_set_legacy_reset(). If they do so, then
* + If a base class B has been moved to multi-phase, then it does not * device_get_transitional_reset() will notice and arrange for the
* override this default reset method and may have defined phase methods. * DeviceClass::legacy_reset() method to be called during the hold phase.
* + A child class C (extending class B) which uses
* device_class_set_parent_reset() (or similar means) to override the
* reset method will still work as expected. @device_phases_reset function
* will be registered as the parent reset method and effectively call
* parent reset phases.
*/ */
device_class_set_legacy_reset(dc, device_phases_reset); dc->legacy_reset = NULL;
rc->get_transitional_function = device_get_transitional_reset; rc->get_transitional_function = device_get_transitional_reset;
object_class_property_add_bool(class, "realized", object_class_property_add_bool(class, "realized",