Re: [PATCH v2 11/11] hw/core/resettable: Remove transitional_function machinery

[Philippe Mathieu-Daudé]

On 30/8/24 16:58, Peter Maydell wrote:
> We used to need the transitional_function machinery to handle bus
> classes and device classes which still used their legacy reset
> handling.  We have now converted all bus classes to three phase
> reset, and simplified the device class legacy reset so it is just an
> adapting wrapper function around registration of a hold phase method.
> There are therefore no more users of the transitional_function
> machinery and we can remove it.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   include/hw/resettable.h | 13 -------------
>   hw/core/resettable.c    | 24 +++---------------------
>   2 files changed, 3 insertions(+), 34 deletions(-)


> @@ -171,12 +157,8 @@ static void resettable_phase_hold(Object *obj, void 
> *opaque, ResetType type)
>       /* exec hold phase */
>       if (s->hold_phase_pending) {
>           s->hold_phase_pending = false;
> -        ResettableTrFunction tr_func = resettable_get_tr_func(rc, obj);
>           trace_resettable_phase_hold_exec(obj, obj_typename, 
> !!rc->phases.hold);
> -        if (tr_func) {
> -            trace_resettable_transitional_function(obj, obj_typename);

Squashing:

-- >8 --
diff --git a/hw/core/trace-events b/hw/core/trace-events
index 2cf085ac66..5cf89da51d 100644
--- a/hw/core/trace-events
+++ b/hw/core/trace-events
@@ -22,3 +22,2 @@ resettable_phase_exit_exec(void *obj, const char 
*objtype, int has_method) "obj=
 resettable_phase_exit_end(void *obj, const char *objtype, unsigned 
count) "obj=%p(%s) count=%d"
-resettable_transitional_function(void *obj, const char *objtype) 
"obj=%p(%s)"
---

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Nice cleanup.