[PULL,01/59] cpu: Introduce cpu_class_set_parent_reset()

Commit Message

Paolo Bonzini Jan. 23, 2020, 1:48 p.m. UTC

From: Greg Kurz <[e-mail]>

Similarly to what we already do with qdev, use a helper to overload the
reset QOM methods of the parent in children classes, for clarity.

Signed-off-by: Greg Kurz <[e-mail]>
Reviewed-by: David Gibson <[e-mail]>
Reviewed-by: Alistair Francis <[e-mail]>
Reviewed-by: Cornelia Huck <[e-mail]>
Acked-by: David Hildenbrand <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Paolo Bonzini <[e-mail]>
---
 hw/core/cpu.c         | 8 ++++++++
 include/hw/core/cpu.h | 4 ++++
 2 files changed, 12 insertions(+)

Patch

diff --git a/hw/core/cpu.c b/hw/core/cpu.c
index db1a03c..fde5fd3 100644
--- a/hw/core/cpu.c
+++ b/hw/core/cpu.c
@@ -239,6 +239,14 @@  void cpu_dump_statistics(CPUState *cpu, int flags)
     }
 }
 
+void cpu_class_set_parent_reset(CPUClass *cc,
+                                void (*child_reset)(CPUState *cpu),
+                                void (**parent_reset)(CPUState *cpu))
+{
+    *parent_reset = cc->reset;
+    cc->reset = child_reset;
+}
+
 void cpu_reset(CPUState *cpu)
 {
     CPUClass *klass = CPU_GET_CLASS(cpu);
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 77c6f05..73e9a86 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -1135,6 +1135,10 @@  void cpu_exec_unrealizefn(CPUState *cpu);
  */
 bool target_words_bigendian(void);
 
+void cpu_class_set_parent_reset(CPUClass *cc,
+                                void (*child_reset)(CPUState *cpu),
+                                void (**parent_reset)(CPUState *cpu));
+
 #ifdef NEED_CPU_H
 
 #ifdef CONFIG_SOFTMMU