c461a1
From 4d23f26f51e1a4b4a8c7aa2d105891e4589f913c Mon Sep 17 00:00:00 2001
c461a1
From: Eduardo Habkost <ehabkost@redhat.com>
c461a1
Date: Thu, 3 Oct 2019 22:12:17 +0200
c461a1
Subject: [PATCH 3/4] i386: remove the 'INTEL_PT' CPUID bit from
c461a1
 Cascadelake-Server
c461a1
c461a1
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
c461a1
Message-id: <20191003221217.8527-4-ehabkost@redhat.com>
c461a1
Patchwork-id: 90954
c461a1
O-Subject: [RHEL-7.8 qemu-kvm PATCH 3/3] i386: remove the 'INTEL_PT' CPUID bit from Cascadelake-Server
c461a1
Bugzilla: 1638471
c461a1
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
c461a1
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
c461a1
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
c461a1
c461a1
From: Paolo Bonzini <pbonzini@redhat.com>
c461a1
c461a1
This is a partial cherry pick of upstream commit:
c461a1
c461a1
commit 4c257911dcc7c4189768e9651755c849ce9db4e8
c461a1
Author: Paolo Bonzini <pbonzini@redhat.com>
c461a1
Date:   Fri Dec 21 12:35:56 2018 +0100
c461a1
c461a1
    i386: remove the 'INTEL_PT' CPUID bit from named CPU models
c461a1
c461a1
    Processor tracing is not yet implemented for KVM and it will be an
c461a1
    opt in feature requiring a special module parameter.
c461a1
    Disable it, because it is wrong to enable it by default and
c461a1
    it is impossible that no one has ever used it.
c461a1
c461a1
    Cc: qemu-stable@nongnu.org
c461a1
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
c461a1
c461a1
It includes only the Cascadelake-Server change, because the other
c461a1
CPU models are not present in the RHEL7 tree.
c461a1
c461a1
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
c461a1
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
c461a1
---
c461a1
 target-i386/cpu.c | 3 +--
c461a1
 1 file changed, 1 insertion(+), 2 deletions(-)
c461a1
c461a1
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
c461a1
index 926373b..b4839df 100644
c461a1
--- a/target-i386/cpu.c
c461a1
+++ b/target-i386/cpu.c
c461a1
@@ -1528,8 +1528,7 @@ static x86_def_t builtin_x86_defs[] = {
c461a1
             CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX | CPUID_7_0_EBX_CLWB |
c461a1
             CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ |
c461a1
             CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |
c461a1
-            CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT |
c461a1
-            CPUID_7_0_EBX_INTEL_PT,
c461a1
+            CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT,
c461a1
         .features[FEAT_7_0_ECX] =
c461a1
             CPUID_7_0_ECX_PKU |
c461a1
             CPUID_7_0_ECX_AVX512VNNI,
c461a1
-- 
c461a1
1.8.3.1
c461a1