SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/mips/loongson3_virt: Pass CPU argument to get_cpu_freq_hz()

Browse Source 
Pass the first vCPU as argument, allowing to remove
another &first_cpu global use.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250115232952.31166-5-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-12 21:42:10 +01:00
parent 87fd8a80c7
commit 72a4da9386
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/mips/loongson3_virt.c
View File

@ -153,7 +153,7 @@ static const MemoryRegionOps loongson3_pm_ops = {
#define DEF_LOONGSON3_FREQ (800 * 1000 * 1000) #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 #ifdef CONFIG_KVM
int ret; int ret;
@ -164,7 +164,7 @@ static uint64_t get_cpu_freq_hz(void)
}; };
if (kvm_enabled()) { 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) { if (ret >= 0) {
return freq * 2; return freq * 2;
} }
@ -633,7 +633,7 @@ static void mips_loongson3_virt_init(MachineState *machine)
* Please use -L to set the BIOS path and -bios to set bios name. * 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(cpu);
loaderparams.ram_size = ram_size; loaderparams.ram_size = ram_size;
if (kernel_filename) { if (kernel_filename) {
loaderparams.kernel_filename = kernel_filename; loaderparams.kernel_filename = kernel_filename;