diff options
| author | Xiaoyao Li <xiaoyao.li@intel.com> | 2025-03-04 00:24:49 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2025-06-20 13:25:59 +0200 |
| commit | e68ec2980901c8e7f948f3305770962806c53f0b (patch) | |
| tree | 530840697056c0631f9a822355e2e6ad1f05e220 | |
| parent | 6b3fad084fc4e13901e252fe6c2a2c46ecea999b (diff) | |
| download | qemu-e68ec2980901c8e7f948f3305770962806c53f0b.zip qemu-e68ec2980901c8e7f948f3305770962806c53f0b.tar.gz qemu-e68ec2980901c8e7f948f3305770962806c53f0b.tar.bz2 | |
i386/cpu: Move adjustment of CPUID_EXT_PDCM before feature_dependencies[] check
There is one entry relates to CPUID_EXT_PDCM in feature_dependencies[].
So it needs to get correct value of CPUID_EXT_PDCM before using
feature_dependencies[] to apply dependencies.
Besides, it also ensures CPUID_EXT_PDCM value is tracked in
env->features[FEAT_1_ECX].
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20250304052450.465445-2-xiaoyao.li@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | target/i386/cpu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 40aefb3..29bce67 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7349,9 +7349,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, if (threads_per_pkg > 1) { *ebx |= threads_per_pkg << 16; } - if (!cpu->enable_pmu) { - *ecx &= ~CPUID_EXT_PDCM; - } break; case 2: /* cache info: needed for Pentium Pro compatibility */ @@ -8341,6 +8338,10 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp) } } + if (!cpu->enable_pmu) { + env->features[FEAT_1_ECX] &= ~CPUID_EXT_PDCM; + } + for (i = 0; i < ARRAY_SIZE(feature_dependencies); i++) { FeatureDep *d = &feature_dependencies[i]; if (!(env->features[d->from.index] & d->from.mask)) { |