From 0da6b74f699291688c07018c06d0880bad97cb5a Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 3 Jul 2018 05:09:37 -0400 Subject: [PATCH] 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. Backports commit 0b33968e7f4cf998f678b2d1a5be3d6f3f3513d8 from qemu --- qemu/target/arm/cpu.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/qemu/target/arm/cpu.c b/qemu/target/arm/cpu.c index ad066387..4de20d6e 100644 --- a/qemu/target/arm/cpu.c +++ b/qemu/target/arm/cpu.c @@ -1549,9 +1549,6 @@ static void arm_max_initfn(struct uc_struct *uc, Object *obj, void *opaque) * 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);