SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu: Move CPUClass::get_crash_info to SysemuCPUOps

Browse Source 
cpu_get_crash_info() is called on GUEST_PANICKED events,
which only occur in system emulation.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210517105140.1062037-18-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2021-05-17 12:51:34 +02:00 committed by Richard Henderson
parent da383e0263
commit 83ec01b675
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/core/cpu-sysemu.c
View File

@ -138,8 +138,8 @@ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu)
CPUClass *cc = CPU_GET_CLASS(cpu); CPUClass *cc = CPU_GET_CLASS(cpu);
GuestPanicInformation *res = NULL; GuestPanicInformation *res = NULL;
if (cc->get_crash_info) { if (cc->sysemu_ops->get_crash_info) {
res = cc->get_crash_info(cpu); res = cc->sysemu_ops->get_crash_info(cpu);
} }
return res; return res;
} }

1
include/hw/core/cpu.h
View File

@ -151,7 +151,6 @@ struct CPUClass {
int (*memory_rw_debug)(CPUState *cpu, vaddr addr, int (*memory_rw_debug)(CPUState *cpu, vaddr addr,
uint8_t *buf, int len, bool is_write); uint8_t *buf, int len, bool is_write);
void (*dump_state)(CPUState *cpu, FILE *, int flags); void (*dump_state)(CPUState *cpu, FILE *, int flags);
GuestPanicInformation* (*get_crash_info)(CPUState *cpu);
void (*dump_statistics)(CPUState *cpu, int flags); void (*dump_statistics)(CPUState *cpu, int flags);
int64_t (*get_arch_id)(CPUState *cpu); int64_t (*get_arch_id)(CPUState *cpu);
bool (*get_paging_enabled)(const CPUState *cpu); bool (*get_paging_enabled)(const CPUState *cpu);

5
include/hw/core/sysemu-cpu-ops.h
View File

@ -16,6 +16,11 @@
* struct SysemuCPUOps: System operations specific to a CPU class * struct SysemuCPUOps: System operations specific to a CPU class
*/ */
typedef struct SysemuCPUOps { typedef struct SysemuCPUOps {
/**
* @get_crash_info: Callback for reporting guest crash information in
* GUEST_PANICKED events.
*/
GuestPanicInformation* (*get_crash_info)(CPUState *cpu);
/** /**
* @virtio_is_big_endian: Callback to return %true if a CPU which supports * @virtio_is_big_endian: Callback to return %true if a CPU which supports
* runtime configurable endianness is currently big-endian. * runtime configurable endianness is currently big-endian.

2
target/i386/cpu.c
View File

@ -6718,6 +6718,7 @@ static Property x86_cpu_properties[] = {
#include "hw/core/sysemu-cpu-ops.h" #include "hw/core/sysemu-cpu-ops.h"
static const struct SysemuCPUOps i386_sysemu_ops = { static const struct SysemuCPUOps i386_sysemu_ops = {
.get_crash_info = x86_cpu_get_crash_info,
.legacy_vmsd = &vmstate_x86_cpu, .legacy_vmsd = &vmstate_x86_cpu,
}; };
#endif #endif
@ -6752,7 +6753,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
cc->asidx_from_attrs = x86_asidx_from_attrs; cc->asidx_from_attrs = x86_asidx_from_attrs;
cc->get_memory_mapping = x86_cpu_get_memory_mapping; cc->get_memory_mapping = x86_cpu_get_memory_mapping;
cc->get_phys_page_attrs_debug = x86_cpu_get_phys_page_attrs_debug; cc->get_phys_page_attrs_debug = x86_cpu_get_phys_page_attrs_debug;
cc->get_crash_info = x86_cpu_get_crash_info;
cc->write_elf64_note = x86_cpu_write_elf64_note; cc->write_elf64_note = x86_cpu_write_elf64_note;
cc->write_elf64_qemunote = x86_cpu_write_elf64_qemunote; cc->write_elf64_qemunote = x86_cpu_write_elf64_qemunote;
cc->write_elf32_note = x86_cpu_write_elf32_note; cc->write_elf32_note = x86_cpu_write_elf32_note;

2
target/s390x/cpu.c
View File

@ -480,6 +480,7 @@ static void s390_cpu_reset_full(DeviceState *dev)
#include "hw/core/sysemu-cpu-ops.h" #include "hw/core/sysemu-cpu-ops.h"
static const struct SysemuCPUOps s390_sysemu_ops = { static const struct SysemuCPUOps s390_sysemu_ops = {
.get_crash_info = s390_cpu_get_crash_info,
.legacy_vmsd = &vmstate_s390_cpu, .legacy_vmsd = &vmstate_s390_cpu,
}; };
#endif #endif
@ -524,7 +525,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
cc->gdb_write_register = s390_cpu_gdb_write_register; cc->gdb_write_register = s390_cpu_gdb_write_register;
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
cc->get_phys_page_debug = s390_cpu_get_phys_page_debug; cc->get_phys_page_debug = s390_cpu_get_phys_page_debug;
cc->get_crash_info = s390_cpu_get_crash_info;
cc->write_elf64_note = s390_cpu_write_elf64_note; cc->write_elf64_note = s390_cpu_write_elf64_note;
cc->sysemu_ops = &s390_sysemu_ops; cc->sysemu_ops = &s390_sysemu_ops;
#endif #endif