diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-04-12 17:08:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-04-25 10:21:06 +0100 |
| commit | ad80e36744785fe9326d4104d98e976822e90cc2 (patch) | |
| tree | 99c22bd64e751d16bb2438664641baaa9a93a680 /hw/core/resettable.c | |
| parent | aadea887f4429fcc96429b126c254de94317b474 (diff) | |
| download | focaccia-qemu-ad80e36744785fe9326d4104d98e976822e90cc2.tar.gz focaccia-qemu-ad80e36744785fe9326d4104d98e976822e90cc2.zip | |
hw, target: Add ResetType argument to hold and exit phase methods
We pass a ResetType argument to the Resettable class enter
phase method, but we don't pass it to hold and exit, even though
the callsites have it readily available. This means that if
a device cared about the ResetType it would need to record it
in the enter phase method to use later on. Pass the type to
all three of the phase methods to avoid having to do that.
Commit created with
for dir in hw target include; do \
spatch --macro-file scripts/cocci-macro-file.h \
--sp-file scripts/coccinelle/reset-type.cocci \
--keep-comments --smpl-spacing --in-place \
--include-headers --dir $dir; done
and no manual edits.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Luc Michel <luc.michel@amd.com>
Message-id: 20240412160809.1260625-5-peter.maydell@linaro.org
Diffstat (limited to 'hw/core/resettable.c')
| -rw-r--r-- | hw/core/resettable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/core/resettable.c b/hw/core/resettable.c index c3df75c6ba..bebf7f10b2 100644 --- a/hw/core/resettable.c +++ b/hw/core/resettable.c @@ -181,7 +181,7 @@ static void resettable_phase_hold(Object *obj, void *opaque, ResetType type) trace_resettable_transitional_function(obj, obj_typename); tr_func(obj); } else if (rc->phases.hold) { - rc->phases.hold(obj); + rc->phases.hold(obj, type); } } trace_resettable_phase_hold_end(obj, obj_typename, s->count); @@ -204,7 +204,7 @@ static void resettable_phase_exit(Object *obj, void *opaque, ResetType type) if (--s->count == 0) { trace_resettable_phase_exit_exec(obj, obj_typename, !!rc->phases.exit); if (rc->phases.exit && !resettable_get_tr_func(rc, obj)) { - rc->phases.exit(obj); + rc->phases.exit(obj, type); } } s->exit_phase_in_progress = false; |