[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/71] hw/riscv/shakti_c: Check CPU type in machine_run_board_init
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 32/71] hw/riscv/shakti_c: Check CPU type in machine_run_board_init() |
Date: |
Fri, 5 Jan 2024 16:42:25 +0100 |
From: Gavin Shan <gshan@redhat.com>
Set mc->valid_cpu_types so that the user specified CPU type can
be validated in machine_run_board_init(). We needn't to do it
by ourselves.
Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231204004726.483558-10-gshan@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/riscv/shakti_c.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
index 12ea74b032..3888034c2b 100644
--- a/hw/riscv/shakti_c.c
+++ b/hw/riscv/shakti_c.c
@@ -28,7 +28,6 @@
#include "exec/address-spaces.h"
#include "hw/riscv/boot.h"
-
static const struct MemmapEntry {
hwaddr base;
hwaddr size;
@@ -47,12 +46,6 @@ static void shakti_c_machine_state_init(MachineState *mstate)
ShaktiCMachineState *sms = RISCV_SHAKTI_MACHINE(mstate);
MemoryRegion *system_memory = get_system_memory();
- /* Allow only Shakti C CPU for this platform */
- if (strcmp(mstate->cpu_type, TYPE_RISCV_CPU_SHAKTI_C) != 0) {
- error_report("This board can only be used with Shakti C CPU");
- exit(1);
- }
-
/* Initialize SoC */
object_initialize_child(OBJECT(mstate), "soc", &sms->soc,
TYPE_RISCV_SHAKTI_SOC);
@@ -82,9 +75,15 @@ static void shakti_c_machine_instance_init(Object *obj)
static void shakti_c_machine_class_init(ObjectClass *klass, void *data)
{
MachineClass *mc = MACHINE_CLASS(klass);
+ static const char * const valid_cpu_types[] = {
+ RISCV_CPU_TYPE_NAME("shakti-c"),
+ NULL
+ };
+
mc->desc = "RISC-V Board compatible with Shakti SDK";
mc->init = shakti_c_machine_state_init;
mc->default_cpu_type = TYPE_RISCV_CPU_SHAKTI_C;
+ mc->valid_cpu_types = valid_cpu_types;
mc->default_ram_id = "riscv.shakti.c.ram";
}
--
2.41.0
- [PULL 28/71] hw/arm/virt: Hide host CPU model for tcg, (continued)
- [PULL 28/71] hw/arm/virt: Hide host CPU model for tcg, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 24/71] machine: Use error handling when CPU type is checked, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 23/71] hw/core: Add machine_class_default_cpu_type(), Philippe Mathieu-Daudé, 2024/01/05
- [PULL 26/71] machine: Improve is_cpu_type_supported(), Philippe Mathieu-Daudé, 2024/01/05
- [PULL 27/71] machine: Print CPU model name instead of CPU type, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 30/71] hw/arm/sbsa-ref: Check CPU type in machine_run_board_init(), Philippe Mathieu-Daudé, 2024/01/05
- [PULL 33/71] hw/core/cpu: Remove final vestiges of dynamic state tracing, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 29/71] hw/arm/virt: Check CPU type in machine_run_board_init(), Philippe Mathieu-Daudé, 2024/01/05
- [PULL 32/71] hw/riscv/shakti_c: Check CPU type in machine_run_board_init(),
Philippe Mathieu-Daudé <=
- [PULL 31/71] hw/arm: Check CPU type in machine_run_board_init(), Philippe Mathieu-Daudé, 2024/01/05
- [PULL 36/71] hw/cpu/cluster: Cleanup unused included header in cluster.c, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 37/71] hw/audio/sb16: Do not migrate qdev properties, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 34/71] hw/core/cpu: Update description of CPUState::node, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 35/71] hw/cpu/core: Cleanup unused included header in core.c, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 40/71] hw/ppc/spapr_cpu_core: Access QDev properties with proper API, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 39/71] hw/arm/bcm2836: Use ARM_CPU 'mp-affinity' property, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 42/71] hw/ppc/xive2_regs: Remove unnecessary 'cpu.h' inclusion, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 41/71] hw: Simplify accesses to the CPUState::'start-powered-off' property, Philippe Mathieu-Daudé, 2024/01/05
- [PULL 38/71] hw/arm/bcm2836: Simplify use of 'reset-cbar' property, Philippe Mathieu-Daudé, 2024/01/05