diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-01-10 19:07:05 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-01-13 17:21:46 +0100 |
| commit | e555abceec0c7f958d553a39ce4ac79239a34537 (patch) | |
| tree | a0fcfcf6c8db323ad6dea9c826bf2bf634773487 | |
| parent | ef82ab692424c7fb42c3aeb6b65db68eade6213a (diff) | |
| download | qemu-e555abceec0c7f958d553a39ce4ac79239a34537.zip qemu-e555abceec0c7f958d553a39ce4ac79239a34537.tar.gz qemu-e555abceec0c7f958d553a39ce4ac79239a34537.tar.bz2 | |
hw/tricore/triboard: Remove unnecessary use of &first_cpu
triboard_machine_init() has access to the single CPU via:
TriBoardMachineState {
TC27XSoCState {
TriCoreCPU cpu;
...
} tc27x_soc;
} ms;
Pass it as argument to tricore_load_kernel() so we can
remove the &first_cpu global use.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-Id: <20250110180909.83165-1-philmd@linaro.org>
| -rw-r--r-- | hw/tricore/triboard.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/tricore/triboard.c b/hw/tricore/triboard.c index 4dba025..9cc8d28 100644 --- a/hw/tricore/triboard.c +++ b/hw/tricore/triboard.c @@ -31,11 +31,10 @@ #include "hw/tricore/triboard.h" #include "hw/tricore/tc27x_soc.h" -static void tricore_load_kernel(const char *kernel_filename) +static void tricore_load_kernel(TriCoreCPU *cpu, const char *kernel_filename) { uint64_t entry; long kernel_size; - TriCoreCPU *cpu; CPUTriCoreState *env; kernel_size = load_elf(kernel_filename, NULL, @@ -46,7 +45,6 @@ static void tricore_load_kernel(const char *kernel_filename) error_report("no kernel file '%s'", kernel_filename); exit(1); } - cpu = TRICORE_CPU(first_cpu); env = &cpu->env; env->PC = entry; } @@ -62,7 +60,7 @@ static void triboard_machine_init(MachineState *machine) sysbus_realize(SYS_BUS_DEVICE(&ms->tc27x_soc), &error_fatal); if (machine->kernel_filename) { - tricore_load_kernel(machine->kernel_filename); + tricore_load_kernel(&ms->tc27x_soc.cpu, machine->kernel_filename); } } |