Introduce a helper to return the CPU type name given a QemuArchBit. The TYPE_PPC_CPU target have different 32/64-bit definitions so we can not include it yet.
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- --- MAINTAINERS | 1 + include/sysemu/arch_init.h | 2 ++ system/cpu-qom-helpers.c | 58 ++++++++++++++++++++++++++++++++++++++ system/meson.build | 1 + 4 files changed, 62 insertions(+) create mode 100644 system/cpu-qom-helpers.c diff --git a/MAINTAINERS b/MAINTAINERS index ed98814398..af27490243 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -148,6 +148,7 @@ M: Richard Henderson <richard.hender...@linaro.org> R: Paolo Bonzini <pbonz...@redhat.com> S: Maintained F: system/cpus.c +F: system/cpu-qom-helpers.c F: system/watchpoint.c F: cpu-common.c F: cpu-target.c diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h index cf597c40a3..1874f18e67 100644 --- a/include/sysemu/arch_init.h +++ b/include/sysemu/arch_init.h @@ -27,6 +27,8 @@ typedef enum QemuArchBit { QEMU_ARCH_BIT_LAST = QEMU_ARCH_BIT_LOONGARCH } QemuArchBit; +const char *cpu_typename_by_arch_bit(QemuArchBit arch_bit); + enum QemuArchMask { QEMU_ARCH_ALL = -1, QEMU_ARCH_ALPHA = (1 << QEMU_ARCH_BIT_ALPHA), diff --git a/system/cpu-qom-helpers.c b/system/cpu-qom-helpers.c new file mode 100644 index 0000000000..0d402ee3a0 --- /dev/null +++ b/system/cpu-qom-helpers.c @@ -0,0 +1,58 @@ +/* + * Helpers for CPU QOM types + * + * SPDX-FileCopyrightText: 2024 Linaro Ltd. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "sysemu/arch_init.h" + +#include "target/alpha/cpu-qom.h" +#include "target/arm/cpu-qom.h" +#include "target/avr/cpu-qom.h" +#include "target/cris/cpu-qom.h" +#include "target/hexagon/cpu-qom.h" +#include "target/hppa/cpu-qom.h" +#include "target/i386/cpu-qom.h" +#include "target/loongarch/cpu-qom.h" +#include "target/m68k/cpu-qom.h" +#include "target/microblaze/cpu-qom.h" +#include "target/mips/cpu-qom.h" +#include "target/nios2/cpu-qom.h" +#include "target/openrisc/cpu-qom.h" +#include "target/riscv/cpu-qom.h" +#include "target/rx/cpu-qom.h" +#include "target/s390x/cpu-qom.h" +#include "target/sparc/cpu-qom.h" +#include "target/sh4/cpu-qom.h" +#include "target/tricore/cpu-qom.h" +#include "target/xtensa/cpu-qom.h" + +const char *cpu_typename_by_arch_bit(QemuArchBit arch_bit) +{ + static const char *cpu_bit_to_typename[QEMU_ARCH_BIT_LAST + 1] = { + [QEMU_ARCH_BIT_ALPHA] = TYPE_ALPHA_CPU, + [QEMU_ARCH_BIT_ARM] = TYPE_ARM_CPU, + [QEMU_ARCH_BIT_CRIS] = TYPE_CRIS_CPU, + [QEMU_ARCH_BIT_I386] = TYPE_I386_CPU, + [QEMU_ARCH_BIT_M68K] = TYPE_M68K_CPU, + [QEMU_ARCH_BIT_MICROBLAZE] = TYPE_MICROBLAZE_CPU, + [QEMU_ARCH_BIT_MIPS] = TYPE_MIPS_CPU, + /* TODO: TYPE_PPC_CPU */ + [QEMU_ARCH_BIT_S390X] = TYPE_S390_CPU, + [QEMU_ARCH_BIT_SH4] = TYPE_SUPERH_CPU, + [QEMU_ARCH_BIT_SPARC] = TYPE_SPARC_CPU, + [QEMU_ARCH_BIT_XTENSA] = TYPE_XTENSA_CPU, + [QEMU_ARCH_BIT_OPENRISC] = TYPE_OPENRISC_CPU, + [QEMU_ARCH_BIT_TRICORE] = TYPE_TRICORE_CPU, + [QEMU_ARCH_BIT_NIOS2] = TYPE_NIOS2_CPU, + [QEMU_ARCH_BIT_HPPA] = TYPE_HPPA_CPU, + [QEMU_ARCH_BIT_RISCV] = TYPE_RISCV_CPU, + [QEMU_ARCH_BIT_RX] = TYPE_RX_CPU, + [QEMU_ARCH_BIT_AVR] = TYPE_AVR_CPU, + [QEMU_ARCH_BIT_HEXAGON] = TYPE_HEXAGON_CPU, + [QEMU_ARCH_BIT_LOONGARCH] = TYPE_LOONGARCH_CPU, + }; + return cpu_bit_to_typename[arch_bit]; +} diff --git a/system/meson.build b/system/meson.build index 25e2117250..c6ee97e3b2 100644 --- a/system/meson.build +++ b/system/meson.build @@ -10,6 +10,7 @@ system_ss.add(files( 'balloon.c', 'bootdevice.c', 'cpus.c', + 'cpu-qom-helpers.c', 'cpu-throttle.c', 'cpu-timers.c', 'datadir.c', -- 2.41.0