]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Revert "i386/cpu: Warn about why CPUID_EXT_PDCM is not available"
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 19 Aug 2025 15:02:35 +0000 (17:02 +0200)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 19 Aug 2025 18:05:56 +0000 (14:05 -0400)
This reverts commit 00268e00027459abede448662f8794d78eb4b0a4.
(The only conflict is in the !is_tdx_vm() part of the condition,
which is safe to keep).

mark_unavailable_features() actively blocks usage of the feature,
so it is a functional change, not merely a emitting warning.
The commit was intended to merely warn if PDCM was enabled when
the performance counters are not, so revert it.

Reported-by: Christian A. Ehrhardt <christian.ehrhardt@canonical.com>
Analyzed-by: Daniel P. Berrangé <berrange@redhat.com>
Analyzed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20250819150235.785559-1-pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
target/i386/cpu.c

index 673f8583c8095869db40de8ebe44b7ceb8bad6cb..6d85149e6e1b5cd2e1cc7b67d850114383764f73 100644 (file)
@@ -8946,9 +8946,6 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
 
     /* PDCM is fixed1 bit for TDX */
     if (!cpu->enable_pmu && !is_tdx_vm()) {
-        mark_unavailable_features(cpu, FEAT_1_ECX,
-                                  env->user_features[FEAT_1_ECX] & CPUID_EXT_PDCM,
-                                  "This feature is not available due to PMU being disabled");
         env->features[FEAT_1_ECX] &= ~CPUID_EXT_PDCM;
     }