[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/11] hw/mips/loongson3_virt: Pass CPU argument to get_cpu_freq_
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 04/11] hw/mips/loongson3_virt: Pass CPU argument to get_cpu_freq_hz() |
Date: |
Sun, 12 Jan 2025 22:58:28 +0100 |
Pass the first vCPU as argument, allowing to remove
another &first_cpu global use.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/mips/loongson3_virt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index 032ff92383e..078ad46174f 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -153,7 +153,7 @@ static const MemoryRegionOps loongson3_pm_ops = {
#define DEF_LOONGSON3_FREQ (800 * 1000 * 1000)
-static uint64_t get_cpu_freq_hz(void)
+static uint64_t get_cpu_freq_hz(const MIPSCPU *cpu)
{
#ifdef CONFIG_KVM
int ret;
@@ -164,7 +164,7 @@ static uint64_t get_cpu_freq_hz(void)
};
if (kvm_enabled()) {
- ret = kvm_vcpu_ioctl(first_cpu, KVM_GET_ONE_REG, &freq_reg);
+ ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_ONE_REG, &freq_reg);
if (ret >= 0) {
return freq * 2;
}
@@ -635,7 +635,7 @@ static void mips_loongson3_virt_init(MachineState *machine)
* Please use -L to set the BIOS path and -bios to set bios name.
*/
- loaderparams.cpu_freq = get_cpu_freq_hz();
+ loaderparams.cpu_freq = get_cpu_freq_hz(cpus[0]);
loaderparams.ram_size = ram_size;
if (kernel_filename) {
loaderparams.kernel_filename = kernel_filename;
--
2.47.1
- [PATCH 00/11] hw/mips/loongson3: Remove uses of &first_cpu global, Philippe Mathieu-Daudé, 2025/01/12
- [PATCH 01/11] hw/mips/loongson3_virt: Factor generic_cpu_reset() out, Philippe Mathieu-Daudé, 2025/01/12
- [PATCH 02/11] hw/mips/loongson3_virt: Keep reference of vCPUs in machine_init(), Philippe Mathieu-Daudé, 2025/01/12
- [PATCH 03/11] hw/mips/loongson3_virt: Have fw_conf_init() access local loaderparams, Philippe Mathieu-Daudé, 2025/01/12
- [PATCH 04/11] hw/mips/loongson3_virt: Pass CPU argument to get_cpu_freq_hz(),
Philippe Mathieu-Daudé <=
- [PATCH 05/11] hw/mips/loongson3_bootp: Include missing headers, Philippe Mathieu-Daudé, 2025/01/12
- [PATCH 06/11] hw/mips/loongson3: Propagate cpu_count to init_loongson_params(), Philippe Mathieu-Daudé, 2025/01/12
- [PATCH 07/11] hw/mips/loongson3_virt: Propagate cpu_count to init_boot_param(), Philippe Mathieu-Daudé, 2025/01/12
- [PATCH 08/11] hw/mips/loongson3_bootp: Propagate processor_id to init_cpu_info(), Philippe Mathieu-Daudé, 2025/01/12
- [PATCH 09/11] hw/mips/loongson3_virt: Propagate processor_id to init_loongson_params(), Philippe Mathieu-Daudé, 2025/01/12