motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-29 13:23:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

i386/cpu: Set up CPUID_HT in x86_cpu_expand_features() instead of cpu_x86_cpuid()

Browse source 
Currently CPUID_HT is evaluated in cpu_x86_cpuid() each time. It's not a
correct usage of how feature bit is maintained and evaluated. The
expected practice is that features are tracked in env->features[] and
cpu_x86_cpuid() should be the consumer of env->features[].

Track CPUID_HT in env->features[FEAT_1_EDX] instead and evaluate it in
cpu's realizefn().

Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Link: https://lore.kernel.org/r/20241219110125.1266461-10-xiaoyao.li@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Xiaoyao Li 2024-12-19 06:01:24 -05:00 • committed by Paolo Bonzini
parent 6e090ffe0d
commit c6bd2dd634
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
target/i386/cpu.c
View file

@ -6538,7 +6538,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*edx = env->features[FEAT_1_EDX]; *edx = env->features[FEAT_1_EDX];
if (threads_per_pkg > 1) { if (threads_per_pkg > 1) {
*ebx |= threads_per_pkg << 16; *ebx |= threads_per_pkg << 16;
*edx |= CPUID_HT;
} }
if (!cpu->enable_pmu) { if (!cpu->enable_pmu) {
*ecx &= ~CPUID_EXT_PDCM; *ecx &= ~CPUID_EXT_PDCM;
@ -7529,6 +7528,10 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
} }
} }
if (x86_threads_per_pkg(&env->topo_info) > 1) {
env->features[FEAT_1_EDX] |= CPUID_HT;
}
for (i = 0; i < ARRAY_SIZE(feature_dependencies); i++) { for (i = 0; i < ARRAY_SIZE(feature_dependencies); i++) {
FeatureDep *d = &feature_dependencies[i]; FeatureDep *d = &feature_dependencies[i];
if (!(env->features[d->from.index] & d->from.mask)) { if (!(env->features[d->from.index] & d->from.mask)) {