motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

i386/cpu: Extract a common fucntion to setup value of MSR_CORE_THREAD_COUNT

Browse source 
There are duplicated code to setup the value of MSR_CORE_THREAD_COUNT.
Extract a common function for it.

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20241219110125.1266461-2-xiaoyao.li@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Xiaoyao Li 2024-12-19 06:01:16 -05:00 • committed by Paolo Bonzini
parent d662b66da4
commit d3bb5d0d4f
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
target/i386/cpu-system.c
View file

@ -309,3 +309,14 @@ void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v,
errp); errp);
qapi_free_GuestPanicInformation(panic_info); qapi_free_GuestPanicInformation(panic_info);
} }
uint64_t cpu_x86_get_msr_core_thread_count(X86CPU *cpu)
{
CPUState *cs = CPU(cpu);
uint64_t val;
val = cs->nr_threads * cs->nr_cores; /* thread count, bits 15..0 */
val |= ((uint32_t)cs->nr_cores << 16); /* core count, bits 31..16 */
return val;
}

2
target/i386/cpu.h
View file

@ -2413,6 +2413,8 @@ static inline void cpu_x86_load_seg_cache_sipi(X86CPU *cpu,
cs->halted = 0; cs->halted = 0;
} }
uint64_t cpu_x86_get_msr_core_thread_count(X86CPU *cpu);
int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector, int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector,
target_ulong *base, unsigned int *limit, target_ulong *base, unsigned int *limit,
unsigned int *flags); unsigned int *flags);

3
target/i386/hvf/x86_emu.c
View file

@ -765,8 +765,7 @@ void simulate_rdmsr(CPUX86State *env)
val = env->mtrr_deftype; val = env->mtrr_deftype;
break; break;
case MSR_CORE_THREAD_COUNT: case MSR_CORE_THREAD_COUNT:
val = cs->nr_threads * cs->nr_cores; /* thread count, bits 15..0 */ val = cpu_x86_get_msr_core_thread_count(cpu);
val |= ((uint32_t)cs->nr_cores << 16); /* core count, bits 31..16 */
break; break;
default: default:
/* fprintf(stderr, "%s: unknown msr 0x%x\n", __func__, msr); */ /* fprintf(stderr, "%s: unknown msr 0x%x\n", __func__, msr); */

5
target/i386/kvm/kvm.c
View file

@ -2614,10 +2614,7 @@ static bool kvm_rdmsr_core_thread_count(X86CPU *cpu,
uint32_t msr, uint32_t msr,
uint64_t *val) uint64_t *val)
{ {
CPUState *cs = CPU(cpu); *val = cpu_x86_get_msr_core_thread_count(cpu);
*val = cs->nr_threads * cs->nr_cores; /* thread count, bits 15..0 */
*val |= ((uint32_t)cs->nr_cores << 16); /* core count, bits 31..16 */
return true; return true;
} }

3
target/i386/tcg/system/misc_helper.c
View file

@ -468,8 +468,7 @@ void helper_rdmsr(CPUX86State *env)
val = x86_cpu->ucode_rev; val = x86_cpu->ucode_rev;
break; break;
case MSR_CORE_THREAD_COUNT: { case MSR_CORE_THREAD_COUNT: {
CPUState *cs = CPU(x86_cpu); val = cpu_x86_get_msr_core_thread_count(x86_cpu);
val = (cs->nr_threads * cs->nr_cores) | (cs->nr_cores << 16);
break; break;
} }
case MSR_APIC_START ... MSR_APIC_END: { case MSR_APIC_START ... MSR_APIC_END: {