diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-01-12 21:38:52 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-01-31 19:36:43 +0100 |
| commit | 03ed671c82b97ab1640dd5e0c8c5adcf1c4c6ced (patch) | |
| tree | 4137aa4eb397a76d9706c03eb29a336d3fe76eac | |
| parent | 61f6e494e3ee060c92491d8df9315e4fdf590864 (diff) | |
| download | qemu-03ed671c82b97ab1640dd5e0c8c5adcf1c4c6ced.zip qemu-03ed671c82b97ab1640dd5e0c8c5adcf1c4c6ced.tar.gz qemu-03ed671c82b97ab1640dd5e0c8c5adcf1c4c6ced.tar.bz2 | |
hw/mips/loongson3_virt: Propagate cpu_count to init_boot_param()
Remove one use of the 'current_machine' global.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250115232952.31166-8-philmd@linaro.org>
| -rw-r--r-- | hw/mips/loongson3_virt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index eb2a6a2..5fe5bc6 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -173,7 +173,7 @@ static uint64_t get_cpu_freq_hz(const MIPSCPU *cpu) return DEF_LOONGSON3_FREQ; } -static void init_boot_param(void) +static void init_boot_param(unsigned cpu_count) { static void *p; struct boot_params *bp; @@ -184,8 +184,7 @@ static void init_boot_param(void) bp->efi.smbios.vers = cpu_to_le16(1); init_reset_system(&(bp->reset_system)); p += ROUND_UP(sizeof(struct boot_params), 64); - init_loongson_params(&(bp->efi.smbios.lp), p, - current_machine->smp.cpus, + init_loongson_params(&(bp->efi.smbios.lp), p, cpu_count, loaderparams.cpu_freq, loaderparams.ram_size); rom_add_blob_fixed("params_rom", bp, @@ -643,7 +642,7 @@ static void mips_loongson3_virt_init(MachineState *machine) loaderparams.kernel_entry = load_kernel(&cpu->env); init_boot_rom(); - init_boot_param(); + init_boot_param(machine->smp.cpus); } else { filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, machine->firmware ?: LOONGSON3_BIOSNAME); |