diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-01-25 06:55:44 +0100 |
|---|---|---|
| committer | Cédric Le Goater <clg@kaod.org> | 2024-02-01 08:13:30 +0100 |
| commit | dc13909ed03c05275deb32512e9d8f8e34d79c3b (patch) | |
| tree | c8782b82aef24eb3965411c40bf806f579e62142 /hw/arm/aspeed_soc_common.c | |
| parent | d815649c512fc785508315ead66a43385cf55bfb (diff) | |
| download | focaccia-qemu-dc13909ed03c05275deb32512e9d8f8e34d79c3b.tar.gz focaccia-qemu-dc13909ed03c05275deb32512e9d8f8e34d79c3b.zip | |
hw/arm/aspeed: Check for CPU types in machine_run_board_init()
Aspeed SoCs use a single CPU type (set as AspeedSoCClass::cpu_type).
Convert it to a NULL-terminated array (of a single non-NULL element).
Set MachineClass::valid_cpu_types[] to use the common machine code
to provide hints when the requested CPU is invalid (see commit
e702cbc19e ("machine: Improve is_cpu_type_supported()").
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Diffstat (limited to 'hw/arm/aspeed_soc_common.c')
| -rw-r--r-- | hw/arm/aspeed_soc_common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/arm/aspeed_soc_common.c b/hw/arm/aspeed_soc_common.c index 36ca189ce9..123a0c432c 100644 --- a/hw/arm/aspeed_soc_common.c +++ b/hw/arm/aspeed_soc_common.c @@ -20,7 +20,10 @@ const char *aspeed_soc_cpu_type(AspeedSoCClass *sc) { - return sc->cpu_type; + assert(sc->valid_cpu_types); + assert(sc->valid_cpu_types[0]); + assert(!sc->valid_cpu_types[1]); + return sc->valid_cpu_types[0]; } qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int dev) |