From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 29 Jun 2018 00:15:36 +0000 (-0700)
Subject: target/arm: Prune a15 features from max
X-Git-Tag: qemu-xen-4.12.0-rc1~122^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0b33968e7f4cf998f678b2d1a5be3d6f3f3513d8;p=qemu-xen.git

target/arm: Prune a15 features from max

There is no need to re-set these 3 features already
implied by the call to aarch64_a15_initfn.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20180629001538.11415-5-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 4584cd01bc..646b122e16 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1803,9 +1803,6 @@ static void arm_max_initfn(Object *obj)
          * since we don't correctly set the ID registers to advertise them,
          */
         set_feature(&cpu->env, ARM_FEATURE_V8);
-        set_feature(&cpu->env, ARM_FEATURE_VFP4);
-        set_feature(&cpu->env, ARM_FEATURE_NEON);
-        set_feature(&cpu->env, ARM_FEATURE_THUMB2EE);
         set_feature(&cpu->env, ARM_FEATURE_V8_AES);
         set_feature(&cpu->env, ARM_FEATURE_V8_SHA1);
         set_feature(&cpu->env, ARM_FEATURE_V8_SHA256);