SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw: Rename DeviceClass::reset field to legacy_reset

Browse Source 
Rename the DeviceClass::reset field to legacy_reset; this is helpful
both in flagging up that it's best not used in new code and in
making it easy to search for where it's being used still.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20240830145812.1967042-9-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-09-13 15:31:45 +01:00
parent e3d0814368
commit 1000872dde
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/core/qdev.c
View File

@ -776,8 +776,8 @@ static void device_transitional_reset(Object *obj)
* devices) or a device's specific method for not-yet transitioned devices. * devices) or a device's specific method for not-yet transitioned devices.
* In both case, it does not reset children. * In both case, it does not reset children.
*/ */
if (dc->reset) { if (dc->legacy_reset) {
dc->reset(DEVICE(obj)); dc->legacy_reset(DEVICE(obj));
} }
} }
@ -788,7 +788,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->reset != device_phases_reset) { if (dc->legacy_reset != device_phases_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.
@ -846,7 +846,7 @@ static void device_class_init(ObjectClass *class, void *data)
void device_class_set_legacy_reset(DeviceClass *dc, DeviceReset dev_reset) void device_class_set_legacy_reset(DeviceClass *dc, DeviceReset dev_reset)
{ {
dc->reset = dev_reset; dc->legacy_reset = dev_reset;
} }
void device_class_set_parent_realize(DeviceClass *dc, void device_class_set_parent_realize(DeviceClass *dc,

4
include/hw/qdev-core.h
View File

@ -152,14 +152,14 @@ struct DeviceClass {
/* callbacks */ /* callbacks */
/** /**
* @reset: deprecated device reset method pointer * @legacy_reset: deprecated device reset method pointer
* *
* Modern code should use the ResettableClass interface to * Modern code should use the ResettableClass interface to
* implement a multi-phase reset. * implement a multi-phase reset.
* *
* TODO: remove once every reset callback is unused * TODO: remove once every reset callback is unused
*/ */
DeviceReset reset; DeviceReset legacy_reset;
DeviceRealize realize; DeviceRealize realize;
DeviceUnrealize unrealize; DeviceUnrealize unrealize;