49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
|
From 9fc28ea52c88d603e85fa806a708b53b373f511e Mon Sep 17 00:00:00 2001
|
||
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
Date: Sat, 16 Feb 2019 00:00:48 +0000
|
||
|
Subject: [PATCH 2/4] i386: remove the new CPUID 'PCONFIG' from Icelake-Server
|
||
|
CPU model
|
||
|
|
||
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
Message-id: <1550275250-41719-2-git-send-email-pbonzini@redhat.com>
|
||
|
Patchwork-id: 84526
|
||
|
O-Subject: [rhel-av-8.0.0 qemu-kvm PATCH 1/3] i386: remove the new CPUID 'PCONFIG' from Icelake-Server CPU model
|
||
|
Bugzilla: 1661515
|
||
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
||
|
From: Robert Hoo <robert.hu@linux.intel.com>
|
||
|
|
||
|
PCONFIG is not available to guests; it must be specifically enabled
|
||
|
using the PCONFIG_ENABLE execution control. Disable it, because
|
||
|
no one can ever use it.
|
||
|
|
||
|
Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>
|
||
|
Message-Id: <1545227081-213696-2-git-send-email-robert.hu@linux.intel.com>
|
||
|
Cc: qemu-stable@nongnu.org
|
||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||
|
(cherry picked from commit 76e5a4d58357b9d077afccf7f7c82e17f733b722)
|
||
|
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 dbcf632..7b63900 100644
|
||
|
--- a/target/i386/cpu.c
|
||
|
+++ b/target/i386/cpu.c
|
||
|
@@ -2675,8 +2675,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
||
|
CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG |
|
||
|
CPUID_7_0_ECX_AVX512_VPOPCNTDQ | CPUID_7_0_ECX_LA57,
|
||
|
.features[FEAT_7_0_EDX] =
|
||
|
- CPUID_7_0_EDX_PCONFIG | CPUID_7_0_EDX_SPEC_CTRL |
|
||
|
- CPUID_7_0_EDX_SPEC_CTRL_SSBD,
|
||
|
+ CPUID_7_0_EDX_SPEC_CTRL | CPUID_7_0_EDX_SPEC_CTRL_SSBD,
|
||
|
/* Missing: XSAVES (not supported by some Linux versions,
|
||
|
* including v4.1 to v4.12).
|
||
|
* KVM doesn't yet expose any XSAVES state save component,
|
||
|
--
|
||
|
1.8.3.1
|
||
|
|