On 07/03/2026 16.26, Philippe Mathieu-Daudé wrote:
The X86CPU::intel_pt_auto_level boolean was only set in the
pc_compat_3_1[] array, via the 'x-intel-pt-auto-level=off'
property. We removed all machines using that array, lets remove

s/lets/let's/

that property and all the code around it.

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
  target/i386/cpu.h | 3 ---
  target/i386/cpu.c | 8 --------
  2 files changed, 11 deletions(-)

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 2b70d56e9b0..5a62aa61579 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -2457,9 +2457,6 @@ struct ArchCPU {
      /* Only advertise TOPOEXT features that AMD defines */
      bool amd_topoext_features_only;
- /* Enable auto level-increase for Intel Processor Trace leave */
-    bool intel_pt_auto_level;
-
      /* if true fill the top bits of the MTRR_PHYSMASKn variable range */
      bool fill_mtrr_mask;
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index c77addd2c25..d8cd0d81d7f 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -9565,13 +9565,7 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
/* Intel Processor Trace requires CPUID[0x14] */
      if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT)) {
-        if (cpu->intel_pt_auto_level) {
              x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14);

I think we should decrease the indentation here now?

-        } else if (cpu->env.cpuid_min_level < 0x14) {
-            mark_unavailable_features(cpu, FEAT_7_0_EBX,
-                CPUID_7_0_EBX_INTEL_PT,
-                "Intel PT need CPUID leaf 0x14, please set by \"-cpu 
...,intel-pt=on,min-level=0x14\"");
-        }
      }

With the indentation fixed:
Reviewed-by: Thomas Huth <[email protected]>


Reply via email to