From 5a66d7f326164d7945ade7ef232b45d3ad347614 Mon Sep 17 00:00:00 2001
From: Igor Mammedov <imammedo@redhat.com>
Date: Wed, 7 Mar 2018 21:39:27 -0500
Subject: [PATCH] sparc: move adhoc CPUSPARCState initialization to realize
 time

SPARCCPU::env was initialized from previously set properties
(with help of sparc_cpu_parse_features) in cpu_sparc_register().
However there is not reason to keep it there as this task is
typically done at realize time. So move post properties
initialization into sparc_cpu_realizefn, which brings
cpu_sparc_init() closer to cpu_generic_init().

Backports commit 700549620b3ee15924f19b9eb79961655ce671c5 from qemu
---
 qemu/target/sparc/cpu.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/qemu/target/sparc/cpu.c b/qemu/target/sparc/cpu.c
index c70e79e5..d17c95a8 100644
--- a/qemu/target/sparc/cpu.c
+++ b/qemu/target/sparc/cpu.c
@@ -99,7 +99,6 @@ static void sparc_cpu_parse_features(CPUState *cs, char *features,
 
 static int cpu_sparc_register(struct uc_struct *uc, SPARCCPU *cpu, const char *cpu_model)
 {
-    CPUSPARCState *env = &cpu->env;
     char *s = g_strdup(cpu_model);
     char *featurestr = strtok(s, ",");
     Error *err = NULL;
@@ -113,19 +112,6 @@ static int cpu_sparc_register(struct uc_struct *uc, SPARCCPU *cpu, const char *c
         return -1;
     }
 
-    env->version = env->def.iu_version;
-    env->fsr = env->def.fpu_version;
-    env->nwindows = env->def.nwindows;
-#if !defined(TARGET_SPARC64)
-    env->mmuregs[0] |= env->def.mmu_version;
-    cpu_sparc_set_id(env, 0);
-    env->mxccregs[7] |= env->def.mxcc_version;
-#else
-    env->mmu_version = env->def.mmu_version;
-    env->maxtl = env->def.maxtl;
-    env->version |= env->def.maxtl << 8;
-    env->version |= env->def.nwindows - 1;
-#endif
     return 0;
 }
 
@@ -849,16 +835,29 @@ static ObjectClass *sparc_cpu_class_by_name(struct uc_struct *uc, const char *cp
 static int sparc_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **errp)
 {
     SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(uc, dev);
-#if defined(CONFIG_USER_ONLY)
     SPARCCPU *cpu = SPARC_CPU(uc, dev);
-    SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(uc, obj);
     CPUSPARCState *env = &cpu->env;
 
+#if defined(CONFIG_USER_ONLY)
     if ((env->def.features & CPU_FEATURE_FLOAT)) {
         env->def.features |= CPU_FEATURE_FLOAT128;
     }
 #endif
 
+    env->version = env->def.iu_version;
+    env->fsr = env->def.fpu_version;
+    env->nwindows = env->def.nwindows;
+#if !defined(TARGET_SPARC64)
+    env->mmuregs[0] |= env->def.mmu_version;
+    cpu_sparc_set_id(env, 0);
+    env->mxccregs[7] |= env->def.mxcc_version;
+#else
+    env->mmu_version = env->def.mmu_version;
+    env->maxtl = env->def.maxtl;
+    env->version |= env->def.maxtl << 8;
+    env->version |= env->def.nwindows - 1;
+#endif
+
     qemu_init_vcpu(CPU(dev));
 
     scc->parent_realize(uc, dev, errp);