From 6131491c7a5494c1c034973ae23fc842b1ee733e Mon Sep 17 00:00:00 2001

From: "plai@redhat.com" <plai@redhat.com>

Date: Mon, 1 Jul 2019 16:17:33 +0100

Subject: [PATCH 04/39] i386: remove the 'INTEL_PT' CPUID bit from named CPU

 models

RH-Author: plai@redhat.com

Message-id: <1561997854-9646-5-git-send-email-plai@redhat.com>

Patchwork-id: 89332

O-Subject: [RHEL8.1 qemu-kvm PATCH v6 4/5] i386: remove the 'INTEL_PT' CPUID bit from named CPU models

Bugzilla: 1629906

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Bandan Das <bsd@redhat.com>

From: Paolo Bonzini <pbonzini@redhat.com>

Processor tracing is not yet implemented for KVM and it will be an

opt in feature requiring a special module parameter.

Disable it, because it is wrong to enable it by default and

it is impossible that no one has ever used it.

Cc: qemu-stable@nongnu.org

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit 4c257911dcc7c4189768e9651755c849ce9db4e8)

Signed-off-by: Paul Lai <plai@redhat.com>

Resolved Conflicts:

	target/i386/cpu.c

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/cpu.c | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c

index 094f8a1..2538d82 100644

--- a/target/i386/cpu.c

+++ b/target/i386/cpu.c

@@ -2515,8 +2515,7 @@ static X86CPUDefinition builtin_x86_defs[] = {

             CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLWB |

             CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ |

             CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |

-            CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT |

-            CPUID_7_0_EBX_INTEL_PT,

+            CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT,

         .features[FEAT_7_0_ECX] =

             CPUID_7_0_ECX_PKU | CPUID_7_0_ECX_OSPKE |

             CPUID_7_0_ECX_AVX512VNNI,

-- 

1.8.3.1