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.ehrha...@canonical.com>
Analyzed-by: Daniel P. Berrangé <berra...@redhat.com>
Analyzed-by: Xiaoyao Li <xiaoyao...@intel.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
target/i386/cpu.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 673f8583c80..6d85149e6e1 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -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;
}
--
2.50.1
