The following changes since commit 0319ad22bd5789e1eaa8a2dd5773db2d2c372f20:

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-and-misc-updates-250521-2' into staging (2021-05-25 17:31:04 +0100)

https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210526

for you to fetch changes up to 119065574d02deffc28fe5b6a864db9b467c6ffd:

hw/core: Constify TCGCPUOps (2021-05-26 15:33:59 -0700)

Adjust types for some memory access functions.

Reduce inclusion of tcg headers.

Fix watchpoints vs replay.

Fix tcg/aarch64 roli expansion.

Introduce SysemuCPUOps structure.

Pavel Dovgalyuk (1):

replay: fix watchpoint processing for reverse debugging

Philippe Mathieu-Daudé (27):

exec/memory_ldst_cached: Sort declarations

exec/memory_ldst_phys: Sort declarations

exec/memory_ldst: Use correct type sizes

exec/memory_ldst_phys: Use correct type sizes

exec/memory_ldst_cached: Use correct type size

exec/memory: Use correct type size

accel/tcg: Reduce 'exec/tb-context.h' inclusion

accel/tcg: Keep TranslationBlock headers local to TCG

cpu: Remove duplicated 'sysemu/hw_accel.h' header

cpu: Split as cpu-common / cpu-sysemu

cpu: Un-inline cpu_get_phys_page_debug and cpu_asidx_from_attrs

cpu: Introduce cpu_virtio_is_big_endian()

cpu: Directly use cpu_write_elf*() fallback handlers in place

cpu: Directly use get_paging_enabled() fallback handlers in place

cpu: Directly use get_memory_mapping() fallback handlers in place

cpu: Assert DeviceClass::vmsd is NULL on user emulation

cpu: Rename CPUClass vmsd -> legacy_vmsd

cpu: Move AVR target vmsd field from CPUClass to DeviceClass

cpu: Introduce SysemuCPUOps structure

cpu: Move CPUClass::vmsd to SysemuCPUOps

cpu: Move CPUClass::virtio_is_big_endian to SysemuCPUOps

cpu: Move CPUClass::get_crash_info to SysemuCPUOps

cpu: Move CPUClass::write_elf* to SysemuCPUOps

cpu: Move CPUClass::asidx_from_attrs to SysemuCPUOps

cpu: Move CPUClass::get_phys_page_debug to SysemuCPUOps

cpu: Move CPUClass::get_memory_mapping to SysemuCPUOps

cpu: Move CPUClass::get_paging_enabled to SysemuCPUOps

Richard Henderson (2):

target/mips: Fold jazz behaviour into mips_cpu_do_transaction_failed

hw/core: Constify TCGCPUOps

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Use uint8_t for (unsigned) byte, and uint16_t for (unsigned)

16-bit word.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-Id: <20210518183655.1711377-4-philmd@redhat.com>

include/exec/memory_ldst.h.inc | 16 ++++++++--------

memory_ldst.c.inc | 20 ++++++++++----------

2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc

--- a/include/exec/memory_ldst.h.inc

+++ b/include/exec/memory_ldst.h.inc

#ifdef TARGET_ENDIANNESS

-extern uint32_t glue(address_space_lduw, SUFFIX)(ARG1_DECL,

+extern uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL,

hwaddr addr, MemTxAttrs attrs, MemTxResult *result);

extern uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL,

hwaddr addr, MemTxAttrs attrs, MemTxResult *result);

@@ -XXX,XX +XXX,XX @@ extern uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL,

extern void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL,

hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);

extern void glue(address_space_stw, SUFFIX)(ARG1_DECL,

- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);

+ hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);

extern void glue(address_space_stl, SUFFIX)(ARG1_DECL,

hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);

extern void glue(address_space_stq, SUFFIX)(ARG1_DECL,

hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);

#else

-extern uint32_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,

+extern uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,

hwaddr addr, MemTxAttrs attrs, MemTxResult *result);

-extern uint32_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL,

+extern uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL,

hwaddr addr, MemTxAttrs attrs, MemTxResult *result);

-extern uint32_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL,

+extern uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL,

hwaddr addr, MemTxAttrs attrs, MemTxResult *result);

extern uint32_t glue(address_space_ldl_le, SUFFIX)(ARG1_DECL,

hwaddr addr, MemTxAttrs attrs, MemTxResult *result);

@@ -XXX,XX +XXX,XX @@ extern uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL,

extern uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL,

hwaddr addr, MemTxAttrs attrs, MemTxResult *result);

extern void glue(address_space_stb, SUFFIX)(ARG1_DECL,

- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);

+ hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result);

extern void glue(address_space_stw_le, SUFFIX)(ARG1_DECL,

- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);

+ hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);

extern void glue(address_space_stw_be, SUFFIX)(ARG1_DECL,

- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);

+ hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);

extern void glue(address_space_stl_le, SUFFIX)(ARG1_DECL,

hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);

extern void glue(address_space_stl_be, SUFFIX)(ARG1_DECL,

diff --git a/memory_ldst.c.inc b/memory_ldst.c.inc

--- a/memory_ldst.c.inc

+++ b/memory_ldst.c.inc

@@ -XXX,XX +XXX,XX @@ uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL,

DEVICE_BIG_ENDIAN);

2.25.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20210517105140.1062037-23-f4bug@amsat.org>

include/hw/core/cpu.h | 2 --

include/hw/core/sysemu-cpu-ops.h | 4 ++++

hw/core/cpu-sysemu.c | 4 ++--

target/i386/cpu.c | 4 +++-

4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h

--- a/include/hw/core/cpu.h

+++ b/include/hw/core/cpu.h

@@ -XXX,XX +XXX,XX @@ struct SysemuCPUOps;

* @dump_state: Callback for dumping state.

* @dump_statistics: Callback for dumping statistics.

* @get_arch_id: Callback for getting architecture-dependent CPU ID.

- * @get_paging_enabled: Callback for inquiring whether paging is enabled.

* @set_pc: Callback for setting the Program Counter register. This

* should have the semantics used by the target architecture when

* setting the PC from a source such as an ELF file entry point;

@@ -XXX,XX +XXX,XX @@ struct CPUClass {

void (*dump_state)(CPUState *cpu, FILE *, int flags);

void (*dump_statistics)(CPUState *cpu, int flags);

int64_t (*get_arch_id)(CPUState *cpu);

- bool (*get_paging_enabled)(const CPUState *cpu);

void (*set_pc)(CPUState *cpu, vaddr value);

int (*gdb_read_register)(CPUState *cpu, GByteArray *buf, int reg);

int (*gdb_write_register)(CPUState *cpu, uint8_t *buf, int reg);

diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-ops.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/core/sysemu-cpu-ops.h

+++ b/include/hw/core/sysemu-cpu-ops.h

@@ -XXX,XX +XXX,XX @@ typedef struct SysemuCPUOps {

*/

void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list,

Error **errp);

+ /**

+ * @get_paging_enabled: Callback for inquiring whether paging is enabled.

+ */

+ bool (*get_paging_enabled)(const CPUState *cpu);

/**

* @get_phys_page_debug: Callback for obtaining a physical address.

*/

diff --git a/hw/core/cpu-sysemu.c b/hw/core/cpu-sysemu.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/core/cpu-sysemu.c

+++ b/hw/core/cpu-sysemu.c

@@ -XXX,XX +XXX,XX @@ bool cpu_paging_enabled(const CPUState *cpu)

{

CPUClass *cc = CPU_GET_CLASS(cpu);

- if (cc->get_paging_enabled) {

- return cc->get_paging_enabled(cpu);

+ if (cc->sysemu_ops->get_paging_enabled) {

+ return cc->sysemu_ops->get_paging_enabled(cpu);

}

return false;

diff --git a/target/i386/cpu.c b/target/i386/cpu.c

index XXXXXXX..XXXXXXX 100644

--- a/target/i386/cpu.c

+++ b/target/i386/cpu.c

@@ -XXX,XX +XXX,XX @@ static int64_t x86_cpu_get_arch_id(CPUState *cs)

return cpu->apic_id;

}

+#if !defined(CONFIG_USER_ONLY)

static bool x86_cpu_get_paging_enabled(const CPUState *cs)

{

X86CPU *cpu = X86_CPU(cs);

return cpu->env.cr[0] & CR0_PG_MASK;

}

+#endif /* !CONFIG_USER_ONLY */

static void x86_cpu_set_pc(CPUState *cs, vaddr value)

{

@@ -XXX,XX +XXX,XX @@ static Property x86_cpu_properties[] = {

static const struct SysemuCPUOps i386_sysemu_ops = {

.get_memory_mapping = x86_cpu_get_memory_mapping,

+ .get_paging_enabled = x86_cpu_get_paging_enabled,

.get_phys_page_attrs_debug = x86_cpu_get_phys_page_attrs_debug,

.asidx_from_attrs = x86_asidx_from_attrs,

.get_crash_info = x86_cpu_get_crash_info,

@@ -XXX,XX +XXX,XX @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)

cc->gdb_read_register = x86_cpu_gdb_read_register;

cc->gdb_write_register = x86_cpu_gdb_write_register;

cc->get_arch_id = x86_cpu_get_arch_id;

- cc->get_paging_enabled = x86_cpu_get_paging_enabled;

#ifndef CONFIG_USER_ONLY

cc->sysemu_ops = &i386_sysemu_ops;

2.25.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-Id: <20210517105140.1062037-22-f4bug@amsat.org>

include/hw/core/cpu.h | 3 ---

include/hw/core/sysemu-cpu-ops.h | 5 +++++

hw/core/cpu-sysemu.c | 4 ++--

target/i386/cpu.c | 2 +-

4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h

--- a/include/hw/core/cpu.h

+++ b/include/hw/core/cpu.h

@@ -XXX,XX +XXX,XX @@ struct SysemuCPUOps;

* @dump_statistics: Callback for dumping statistics.

* @get_arch_id: Callback for getting architecture-dependent CPU ID.

* @get_paging_enabled: Callback for inquiring whether paging is enabled.

- * @get_memory_mapping: Callback for obtaining the memory mappings.

* @set_pc: Callback for setting the Program Counter register. This

* should have the semantics used by the target architecture when

* setting the PC from a source such as an ELF file entry point;

@@ -XXX,XX +XXX,XX @@ struct CPUClass {

void (*dump_statistics)(CPUState *cpu, int flags);

int64_t (*get_arch_id)(CPUState *cpu);

bool (*get_paging_enabled)(const CPUState *cpu);

- void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list,

- Error **errp);

void (*set_pc)(CPUState *cpu, vaddr value);

int (*gdb_read_register)(CPUState *cpu, GByteArray *buf, int reg);

int (*gdb_write_register)(CPUState *cpu, uint8_t *buf, int reg);

diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-ops.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/core/sysemu-cpu-ops.h

+++ b/include/hw/core/sysemu-cpu-ops.h

* struct SysemuCPUOps: System operations specific to a CPU class

typedef struct SysemuCPUOps {

+ /**

+ * @get_memory_mapping: Callback for obtaining the memory mappings.

+ */

+ void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list,

+ Error **errp);

/**

* @get_phys_page_debug: Callback for obtaining a physical address.

*/

diff --git a/hw/core/cpu-sysemu.c b/hw/core/cpu-sysemu.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/core/cpu-sysemu.c

+++ b/hw/core/cpu-sysemu.c

@@ -XXX,XX +XXX,XX @@ void cpu_get_memory_mapping(CPUState *cpu, MemoryMappingList *list,

{

CPUClass *cc = CPU_GET_CLASS(cpu);

- if (cc->get_memory_mapping) {

- cc->get_memory_mapping(cpu, list, errp);

+ if (cc->sysemu_ops->get_memory_mapping) {

+ cc->sysemu_ops->get_memory_mapping(cpu, list, errp);

return;

}

diff --git a/target/i386/cpu.c b/target/i386/cpu.c

index XXXXXXX..XXXXXXX 100644

--- a/target/i386/cpu.c

+++ b/target/i386/cpu.c

@@ -XXX,XX +XXX,XX @@ static Property x86_cpu_properties[] = {

#include "hw/core/sysemu-cpu-ops.h"

static const struct SysemuCPUOps i386_sysemu_ops = {

+ .get_memory_mapping = x86_cpu_get_memory_mapping,

.get_phys_page_attrs_debug = x86_cpu_get_phys_page_attrs_debug,

.asidx_from_attrs = x86_asidx_from_attrs,

.get_crash_info = x86_cpu_get_crash_info,

@@ -XXX,XX +XXX,XX @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)

cc->get_paging_enabled = x86_cpu_get_paging_enabled;

#ifndef CONFIG_USER_ONLY

- cc->get_memory_mapping = x86_cpu_get_memory_mapping;

cc->sysemu_ops = &i386_sysemu_ops;

#endif /* !CONFIG_USER_ONLY */

2.25.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

VirtIO devices are only meaningful with system emulation.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Message-Id: <20210517105140.1062037-17-f4bug@amsat.org>

include/hw/core/cpu.h | 5 -----

include/hw/core/sysemu-cpu-ops.h | 9 +++++++++

hw/core/cpu-sysemu.c | 5 +++--

target/arm/cpu.c | 2 +-

target/ppc/cpu_init.c | 4 +---

5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h

--- a/include/hw/core/cpu.h

+++ b/include/hw/core/cpu.h

@@ -XXX,XX +XXX,XX @@ struct SysemuCPUOps;

* @parse_features: Callback to parse command line arguments.

* @reset_dump_flags: #CPUDumpFlags to use for reset logging.

* @has_work: Callback for checking if there is work to do.

- * @virtio_is_big_endian: Callback to return %true if a CPU which supports

- * runtime configurable endianness is currently big-endian. Non-configurable

- * CPUs can use the default implementation of this method. This method should

- * not be used by any callers other than the pre-1.0 virtio devices.

* @memory_rw_debug: Callback for GDB memory access.

* @dump_state: Callback for dumping state.

* @dump_statistics: Callback for dumping statistics.

@@ -XXX,XX +XXX,XX @@ struct CPUClass {

int reset_dump_flags;

bool (*has_work)(CPUState *cpu);

- bool (*virtio_is_big_endian)(CPUState *cpu);

int (*memory_rw_debug)(CPUState *cpu, vaddr addr,

uint8_t *buf, int len, bool is_write);

void (*dump_state)(CPUState *cpu, FILE *, int flags);

diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-ops.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/core/sysemu-cpu-ops.h

+++ b/include/hw/core/sysemu-cpu-ops.h

@@ -XXX,XX +XXX,XX @@

* struct SysemuCPUOps: System operations specific to a CPU class

*/

typedef struct SysemuCPUOps {

+ /**

+ * @virtio_is_big_endian: Callback to return %true if a CPU which supports

+ * runtime configurable endianness is currently big-endian.

+ * Non-configurable CPUs can use the default implementation of this method.

+ * This method should not be used by any callers other than the pre-1.0

+ * virtio devices.

+ */

+ bool (*virtio_is_big_endian)(CPUState *cpu);

+

/**

* @legacy_vmsd: Legacy state for migration.

* Do not use in new targets, use #DeviceClass::vmsd instead.

diff --git a/hw/core/cpu-sysemu.c b/hw/core/cpu-sysemu.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/core/cpu-sysemu.c

+++ b/hw/core/cpu-sysemu.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/core/cpu.h"

+#include "hw/core/sysemu-cpu-ops.h"

bool cpu_paging_enabled(const CPUState *cpu)

{

@@ -XXX,XX +XXX,XX @@ bool cpu_virtio_is_big_endian(CPUState *cpu)

{

CPUClass *cc = CPU_GET_CLASS(cpu);

- if (cc->virtio_is_big_endian) {

- return cc->virtio_is_big_endian(cpu);

+ if (cc->sysemu_ops->virtio_is_big_endian) {

+ return cc->sysemu_ops->virtio_is_big_endian(cpu);

}

return target_words_bigendian();

}

diff --git a/target/arm/cpu.c b/target/arm/cpu.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/cpu.c

+++ b/target/arm/cpu.c

@@ -XXX,XX +XXX,XX @@ static gchar *arm_gdb_arch_name(CPUState *cs)

#include "hw/core/sysemu-cpu-ops.h"

static const struct SysemuCPUOps arm_sysemu_ops = {

+ .virtio_is_big_endian = arm_cpu_virtio_is_big_endian,

.legacy_vmsd = &vmstate_arm_cpu,

};

#endif

@@ -XXX,XX +XXX,XX @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)

#ifndef CONFIG_USER_ONLY

cc->get_phys_page_attrs_debug = arm_cpu_get_phys_page_attrs_debug;

cc->asidx_from_attrs = arm_asidx_from_attrs;

- cc->virtio_is_big_endian = arm_cpu_virtio_is_big_endian;

cc->write_elf64_note = arm_cpu_write_elf64_note;

cc->write_elf32_note = arm_cpu_write_elf32_note;

cc->sysemu_ops = &arm_sysemu_ops;

diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c

index XXXXXXX..XXXXXXX 100644

--- a/target/ppc/cpu_init.c

+++ b/target/ppc/cpu_init.c

@@ -XXX,XX +XXX,XX @@ static Property ppc_cpu_properties[] = {

#include "hw/core/sysemu-cpu-ops.h"

static const struct SysemuCPUOps ppc_sysemu_ops = {

+ .virtio_is_big_endian = ppc_cpu_is_big_endian,

.legacy_vmsd = &vmstate_ppc_cpu,

};

#endif

@@ -XXX,XX +XXX,XX @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)

cc->gdb_core_xml_file = "power64-core.xml";

#else

cc->gdb_core_xml_file = "power-core.xml";

-#ifndef CONFIG_USER_ONLY

- cc->virtio_is_big_endian = ppc_cpu_is_big_endian;

#endif

cc->disas_set_info = ppc_disas_set_info;

2.25.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

The write_elf*() handlers are used to dump vmcore images.

This feature is only meaningful for system emulation.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Message-Id: <20210517105140.1062037-19-f4bug@amsat.org>

include/hw/core/cpu.h | 17 -----------------

include/hw/core/sysemu-cpu-ops.h | 24 ++++++++++++++++++++++++

hw/core/cpu-sysemu.c | 16 ++++++++--------

target/arm/cpu.c | 4 ++--

target/i386/cpu.c | 8 ++++----

target/ppc/cpu_init.c | 6 ++----

target/riscv/cpu.c | 4 ++--

target/s390x/cpu.c | 2 +-

8 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h

--- a/include/hw/core/cpu.h

+++ b/include/hw/core/cpu.h

@@ -XXX,XX +XXX,XX @@ struct SysemuCPUOps;

* a memory access with the specified memory transaction attributes.

* @gdb_read_register: Callback for letting GDB read a register.

* @gdb_write_register: Callback for letting GDB write a register.

- * @write_elf64_note: Callback for writing a CPU-specific ELF note to a

- * 64-bit VM coredump.

- * @write_elf32_qemunote: Callback for writing a CPU- and QEMU-specific ELF

- * note to a 32-bit VM coredump.

- * @write_elf32_note: Callback for writing a CPU-specific ELF note to a

- * 32-bit VM coredump.

- * @write_elf32_qemunote: Callback for writing a CPU- and QEMU-specific ELF

- * note to a 32-bit VM coredump.

* @gdb_num_core_regs: Number of core registers accessible to GDB.

* @gdb_core_xml_file: File name for core registers GDB XML description.

* @gdb_stop_before_watchpoint: Indicates whether GDB expects the CPU to stop

@@ -XXX,XX +XXX,XX @@ struct CPUClass {

int (*gdb_read_register)(CPUState *cpu, GByteArray *buf, int reg);

int (*gdb_write_register)(CPUState *cpu, uint8_t *buf, int reg);

- int (*write_elf64_note)(WriteCoreDumpFunction f, CPUState *cpu,

- int cpuid, void *opaque);

- int (*write_elf64_qemunote)(WriteCoreDumpFunction f, CPUState *cpu,

- void *opaque);

- int (*write_elf32_note)(WriteCoreDumpFunction f, CPUState *cpu,

- int cpuid, void *opaque);

- int (*write_elf32_qemunote)(WriteCoreDumpFunction f, CPUState *cpu,

- void *opaque);

-

const char *gdb_core_xml_file;

gchar * (*gdb_arch_name)(CPUState *cpu);

const char * (*gdb_get_dynamic_xml)(CPUState *cpu, const char *xmlname);

diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-ops.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/core/sysemu-cpu-ops.h

+++ b/include/hw/core/sysemu-cpu-ops.h

@@ -XXX,XX +XXX,XX @@ typedef struct SysemuCPUOps {

* GUEST_PANICKED events.

*/

GuestPanicInformation* (*get_crash_info)(CPUState *cpu);

+ /**

+ * @write_elf32_note: Callback for writing a CPU-specific ELF note to a

+ * 32-bit VM coredump.

+ */

+ int (*write_elf32_note)(WriteCoreDumpFunction f, CPUState *cpu,

+ int cpuid, void *opaque);

+ /**

+ * @write_elf64_note: Callback for writing a CPU-specific ELF note to a

+ * 64-bit VM coredump.

+ */

+ int (*write_elf64_note)(WriteCoreDumpFunction f, CPUState *cpu,

+ int cpuid, void *opaque);

+ /**

+ * @write_elf32_qemunote: Callback for writing a CPU- and QEMU-specific ELF

+ * note to a 32-bit VM coredump.

+ */

+ int (*write_elf32_qemunote)(WriteCoreDumpFunction f, CPUState *cpu,

+ void *opaque);

+ /**

+ * @write_elf64_qemunote: Callback for writing a CPU- and QEMU-specific ELF

+ * note to a 64-bit VM coredump.

+ */

+ int (*write_elf64_qemunote)(WriteCoreDumpFunction f, CPUState *cpu,

+ void *opaque);

/**

* @virtio_is_big_endian: Callback to return %true if a CPU which supports

* runtime configurable endianness is currently big-endian.

diff --git a/hw/core/cpu-sysemu.c b/hw/core/cpu-sysemu.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/core/cpu-sysemu.c

+++ b/hw/core/cpu-sysemu.c

@@ -XXX,XX +XXX,XX @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu,

{

CPUClass *cc = CPU_GET_CLASS(cpu);

- if (!cc->write_elf32_qemunote) {

+ if (!cc->sysemu_ops->write_elf32_qemunote) {

return 0;

- return (*cc->write_elf32_qemunote)(f, cpu, opaque);

+ return (*cc->sysemu_ops->write_elf32_qemunote)(f, cpu, opaque);

cc->gdb_num_core_regs = 71;

#ifndef CONFIG_USER_ONLY

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c

index XXXXXXX..XXXXXXX 100644

--- a/target/riscv/cpu.c

+++ b/target/riscv/cpu.c

@@ -XXX,XX +XXX,XX @@ static const char *riscv_gdb_get_dynamic_xml(CPUState *cs, const char *xmlname)

#include "hw/core/sysemu-cpu-ops.h"

static const struct SysemuCPUOps riscv_sysemu_ops = {

+ .write_elf64_note = riscv_cpu_write_elf64_note,

+ .write_elf32_note = riscv_cpu_write_elf32_note,

.legacy_vmsd = &vmstate_riscv_cpu,

};

#endif

@@ -XXX,XX +XXX,XX @@ static void riscv_cpu_class_init(ObjectClass *c, void *data)

#ifndef CONFIG_USER_ONLY

cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug;

cc->sysemu_ops = &riscv_sysemu_ops;

- cc->write_elf64_note = riscv_cpu_write_elf64_note;

- cc->write_elf32_note = riscv_cpu_write_elf32_note;

#endif

cc->gdb_arch_name = riscv_gdb_arch_name;

cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml;

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c

index XXXXXXX..XXXXXXX 100644