For now, we keep the global cpu_get_dump_info symbol defined.
Signed-off-by: Pierrick Bouvier <[email protected]>
---
target/arm/arch_dump.c | 30 +++++++++++++++++++-----------
target/arm/cpu.c | 1 +
target/arm/internals.h | 1 +
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c
index 1dd79849c13..dcb0ccc6cc6 100644
--- a/target/arm/arch_dump.c
+++ b/target/arm/arch_dump.c
@@ -24,6 +24,7 @@
#include "system/dump.h"
#include "cpu-features.h"
#include "internals.h"
+#include "hw/core/dump-cpu-ops.h"
/* struct user_pt_regs from arch/arm64/include/uapi/asm/ptrace.h */
struct aarch64_user_regs {
@@ -385,21 +386,14 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f,
CPUState *cs,
return 0;
}
-int cpu_get_dump_info(ArchDumpInfo *info,
- const GuestPhysBlockList *guest_phys_blocks)
+static int arm_get_dump_info(const CPUState *cs, ArchDumpInfo *info,
+ const GuestPhysBlockList *guest_phys_blocks)
{
- ARMCPU *cpu;
- CPUARMState *env;
+ const ARMCPU *cpu = ARM_CPU(cs);
+ const CPUARMState *env = &cpu->env;
GuestPhysBlock *block;
hwaddr lowest_addr = ULLONG_MAX;
- if (first_cpu == NULL) {
- return -1;
- }
-
- cpu = ARM_CPU(first_cpu);
- env = &cpu->env;
-
/* Take a best guess at the phys_base. If we get it wrong then crash
* will need '--machdep phys_offset=<phys-offset>' added to its command
* line, which isn't any worse than assuming we can use zero, but being
@@ -439,6 +433,20 @@ int cpu_get_dump_info(ArchDumpInfo *info,
return 0;
}
+const DumpCPUOps arm_dump_ops = {
+ .get_dump_info = arm_get_dump_info,
+};
+
+int cpu_get_dump_info(ArchDumpInfo *info,
+ const GuestPhysBlockList *guest_phys_blocks)
+{
+ if (first_cpu == NULL) {
+ return -1;
+ }
+
+ return arm_get_dump_info(first_cpu, info, guest_phys_blocks);
+}
+
ssize_t cpu_get_note_size(int class, int machine, int nr_cpus)
{
ARMCPU *cpu = ARM_CPU(first_cpu);
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 81ec1ce21c6..9b84691c475 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -2655,6 +2655,7 @@ static void arm_cpu_class_init(ObjectClass *oc, const
void *data)
#ifndef CONFIG_USER_ONLY
cc->max_as = ARMASIdx_MAX;
cc->sysemu_ops = &arm_sysemu_ops;
+ cc->dump_ops = &arm_dump_ops;
#endif
cc->gdb_arch_name = arm_gdb_arch_name;
cc->gdb_get_core_xml_file = arm_gdb_get_core_xml_file;
diff --git a/target/arm/internals.h b/target/arm/internals.h
index e849e357cfe..02375704937 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -438,6 +438,7 @@ int arm_cpu_mmu_index(CPUState *cs, bool ifetch);
#endif /* CONFIG_TCG */
extern const struct SemihostingCPUOps arm_semihosting_ops;
+extern const struct DumpCPUOps arm_dump_ops;
typedef enum ARMFPRounding {
FPROUNDING_TIEEVEN,
--
2.43.0
