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

hw/core/qdev: Simplify legacy_reset handling 

Now that all devices which still implement a the legacy reset method
register it via device_class_legacy_reset(), we can simplify the
handling of these devices.  Instead of using the complex
Resettable::get_transitional_function machinery, we register a hold
phase method which invokes the DeviceClass::legacy_reset method.

This will allow us to remove all the get_transitional_function
handling from resettable.c.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240830145812.1967042-11-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-09-13 15:31:45 +01:00
parent b5fe9bf296
commit 5fdb6cd272
1 changed files with 22 additions and 33 deletions
hw/core
qdev.c

55
hw/core/qdev.c
View File

@ -747,35 +747,6 @@ device_vmstate_if_get_id(VMStateIf *obj)
return qdev_get_dev_path(dev);
}
static void device_transitional_reset(Object *obj)
{
DeviceClass *dc = DEVICE_GET_CLASS(obj);
/*
* Device still using DeviceClass legacy_reset method. This doesn't
* reset children. device_get_transitional_reset() checked that
* this isn't NULL.
*/
dc->legacy_reset(DEVICE(obj));
}
/**
* device_get_transitional_reset:
* check if the device's class is ready for multi-phase
*/
static ResettableTrFunction device_get_transitional_reset(Object *obj)
{
DeviceClass *dc = DEVICE_GET_CLASS(obj);
if (dc->legacy_reset) {
/*
* dc->reset has been overridden by a subclass,
* the device is not ready for multi phase yet.
*/
return device_transitional_reset;
}
return NULL;
}
static void device_class_init(ObjectClass *class, void *data)
{
DeviceClass *dc = DEVICE_CLASS(class);
@ -800,12 +771,9 @@ static void device_class_init(ObjectClass *class, void *data)
* A NULL legacy_reset implies a three-phase reset device. Devices can
* only be reset using three-phase aware mechanisms, but we still support
* for transitional purposes leaf classes which set the old legacy_reset
* method via device_class_set_legacy_reset(). If they do so, then
* device_get_transitional_reset() will notice and arrange for the
* DeviceClass::legacy_reset() method to be called during the hold phase.
* method via device_class_set_legacy_reset().
*/
dc->legacy_reset = NULL;
rc->get_transitional_function = device_get_transitional_reset;
object_class_property_add_bool(class, "realized",
device_get_realized, device_set_realized);
@ -817,8 +785,29 @@ static void device_class_init(ObjectClass *class, void *data)
offsetof(DeviceState, parent_bus), NULL, 0);
}
static void do_legacy_reset(Object *obj, ResetType type)
{
DeviceClass *dc = DEVICE_GET_CLASS(obj);
dc->legacy_reset(DEVICE(obj));
}
void device_class_set_legacy_reset(DeviceClass *dc, DeviceReset dev_reset)
{
/*
* A legacy DeviceClass::reset has identical semantics to the
* three-phase "hold" method, with no "enter" or "exit"
* behaviour. Classes that use this legacy function must be leaf
* classes that do not chain up to their parent class reset.
* There is no mechanism for resetting a device that does not
* use the three-phase APIs, so the only place which calls
* the legacy_reset hook is do_legacy_reset().
*/
ResettableClass *rc = RESETTABLE_CLASS(dc);
rc->phases.enter = NULL;
rc->phases.hold = do_legacy_reset;
rc->phases.exit = NULL;
dc->legacy_reset = dev_reset;
}