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