|
 |
9ae3a8 |
From 65c528e40cc9e6d3d887fd79284d465bb482bbe2 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 23 Feb 2017 14:29:41 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 11/17] target-i386: Filter FEAT_7_0_EBX TCG features too
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Message-id: <20170223142945.17790-11-ehabkost@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 74044
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.4 qemu-kvm PATCH v2 10/14] target-i386: Filter FEAT_7_0_EBX TCG features too
|
|
|
9ae3a8 |
Bugzilla: 1382122
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The TCG_7_0_EBX_FEATURES macro was defined but never used (it even had a
|
|
|
9ae3a8 |
typo that was never noticed). Make the existing TCG feature filtering
|
|
|
9ae3a8 |
code use it.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reviewed-by: Richard Henderson <rth@twiddle.net>
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Cc: qemu-stable@nongnu.org
|
|
|
9ae3a8 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
9ae3a8 |
(cherry picked from commit d0a70f46fa9a3257089a56f2f620b0eff868557f)
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
target-i386/cpu.c | 3 ++-
|
|
|
9ae3a8 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
|
|
|
9ae3a8 |
index e32d4d7..d424211 100644
|
|
|
9ae3a8 |
--- a/target-i386/cpu.c
|
|
|
9ae3a8 |
+++ b/target-i386/cpu.c
|
|
|
9ae3a8 |
@@ -502,7 +502,7 @@ typedef struct x86_def_t {
|
|
|
9ae3a8 |
#define TCG_EXT3_FEATURES (CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | \
|
|
|
9ae3a8 |
CPUID_EXT3_CR8LEG | CPUID_EXT3_ABM | CPUID_EXT3_SSE4A)
|
|
|
9ae3a8 |
#define TCG_SVM_FEATURES 0
|
|
|
9ae3a8 |
-#define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP \
|
|
|
9ae3a8 |
+#define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP | \
|
|
|
9ae3a8 |
CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ADX)
|
|
|
9ae3a8 |
/* missing:
|
|
|
9ae3a8 |
CPUID_7_0_EBX_FSGSBASE, CPUID_7_0_EBX_HLE, CPUID_7_0_EBX_AVX2,
|
|
|
9ae3a8 |
@@ -2640,6 +2640,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
9ae3a8 |
if (!kvm_enabled()) {
|
|
|
9ae3a8 |
env->features[FEAT_1_EDX] &= TCG_FEATURES;
|
|
|
9ae3a8 |
env->features[FEAT_1_ECX] &= TCG_EXT_FEATURES;
|
|
|
9ae3a8 |
+ env->features[FEAT_7_0_EBX] &= TCG_7_0_EBX_FEATURES;
|
|
|
9ae3a8 |
env->features[FEAT_8000_0001_EDX] &= TCG_EXT2_FEATURES;
|
|
|
9ae3a8 |
env->features[FEAT_8000_0001_ECX] &= TCG_EXT3_FEATURES;
|
|
|
9ae3a8 |
env->features[FEAT_SVM] &= TCG_SVM_FEATURES;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|