[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/14] target: Restrict write_elfXX_note() handlers to system-mod
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 11/14] target: Restrict write_elfXX_note() handlers to system-mode |
Date: |
Fri, 13 Mar 2020 19:36:49 +0100 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
target/arm/cpu.h | 10 +++++-----
target/i386/cpu.h | 18 +++++++++---------
target/ppc/cpu.h | 2 --
target/s390x/internal.h | 3 ++-
target/ppc/translate_init.inc.c | 2 --
5 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 4ffd991b6f..8a22212521 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -958,6 +958,11 @@ void arm_cpu_post_init(Object *obj);
uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz);
#ifndef CONFIG_USER_ONLY
+int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
+ int cpuid, void *opaque);
+int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
+ int cpuid, void *opaque);
+
extern const VMStateDescription vmstate_arm_cpu;
#endif
@@ -982,11 +987,6 @@ int arm_gen_dynamic_xml(CPUState *cpu);
*/
const char *arm_gdb_get_dynamic_xml(CPUState *cpu, const char *xmlname);
-int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
- int cpuid, void *opaque);
-int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
- int cpuid, void *opaque);
-
#ifdef TARGET_AARCH64
int aarch64_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 576f309bbf..f25fe5fc7c 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1738,6 +1738,15 @@ struct X86CPU {
#ifndef CONFIG_USER_ONLY
+int x86_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cpu,
+ int cpuid, void *opaque);
+int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cpu,
+ int cpuid, void *opaque);
+int x86_cpu_write_elf64_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
+ void *opaque);
+int x86_cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
+ void *opaque);
+
extern VMStateDescription vmstate_x86_cpu;
#endif
@@ -1749,15 +1758,6 @@ void x86_cpu_do_interrupt(CPUState *cpu);
bool x86_cpu_exec_interrupt(CPUState *cpu, int int_req);
int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request);
-int x86_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cpu,
- int cpuid, void *opaque);
-int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cpu,
- int cpuid, void *opaque);
-int x86_cpu_write_elf64_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
- void *opaque);
-int x86_cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
- void *opaque);
-
void x86_cpu_get_memory_mapping(CPUState *cpu, MemoryMappingList *list,
Error **errp);
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index b283042515..b9fb76d0b3 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1225,12 +1225,10 @@ int ppc_cpu_gdb_write_register_apple(CPUState *cpu,
uint8_t *buf, int reg);
#ifndef CONFIG_USER_ONLY
void ppc_gdb_gen_spr_xml(PowerPCCPU *cpu);
const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name);
-#endif
int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
int cpuid, void *opaque);
int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
int cpuid, void *opaque);
-#ifndef CONFIG_USER_ONLY
void ppc_cpu_do_system_reset(CPUState *cs);
extern const VMStateDescription vmstate_ppc_cpu;
#endif
diff --git a/target/s390x/internal.h b/target/s390x/internal.h
index d37816104d..dcbd8d2065 100644
--- a/target/s390x/internal.h
+++ b/target/s390x/internal.h
@@ -226,9 +226,10 @@ static inline hwaddr decode_basedisp_s(CPUS390XState *env,
uint32_t ipb,
#define decode_basedisp_rs decode_basedisp_s
/* arch_dump.c */
+#if !defined(CONFIG_USER_ONLY)
int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
int cpuid, void *opaque);
-
+#endif
/* cc_helper.c */
const char *cc_name(enum cc_op cc_op);
diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c
index 53995f62ea..768ec18a28 100644
--- a/target/ppc/translate_init.inc.c
+++ b/target/ppc/translate_init.inc.c
@@ -10902,8 +10902,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void
*data)
#ifndef CONFIG_USER_ONLY
cc->get_phys_page_debug = ppc_cpu_get_phys_page_debug;
cc->vmsd = &vmstate_ppc_cpu;
-#endif
-#if defined(CONFIG_SOFTMMU)
cc->write_elf64_note = ppc64_cpu_write_elf64_note;
cc->write_elf32_note = ppc32_cpu_write_elf32_note;
#endif
--
2.21.1
- Re: [PATCH 07/14] target/riscv/cpu: Restrict CPU migration to system-mode, (continued)
- [PATCH 08/14] exec: Assert CPU migration is not used on user-only build, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 09/14] exec: Drop redundant #ifdeffery, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 10/14] arch_init: Remove unused 'qapi-commands-misc.h' include, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 11/14] target: Restrict write_elfXX_note() handlers to system-mode,
Philippe Mathieu-Daudé <=
- [PATCH 12/14] target/i386: Restrict CpuClass::get_crash_info() to system-mode, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 13/14] target/s390x: Restrict CpuClass::get_crash_info() to system-mode, Philippe Mathieu-Daudé, 2020/03/13
- [PATCH 14/14] hw/core: Restrict CpuClass::get_crash_info() to system-mode, Philippe Mathieu-Daudé, 2020/03/13