cpu: Drop cpu_model_str from CPU_COMMON

afaerber · afaerber · commit 51fb256ab5eb · 2013-10-07T11:48:47.000+02:00
Since this is only read in cpu_copy() and linux-user has a global
cpu_model, drop the field from generic code.

Signed-off-by: Andreas Färber &lt;afaerber@suse.de&gt;
diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
@@ -178,7 +178,5 @@ typedef struct CPUWatchpoint {
                                                                         \
     /* user data */                                                     \
     void *opaque;                                                       \
-                                                                        \
-    const char *cpu_model_str;
 
 #endif
diff --git a/linux-user/main.c b/linux-user/main.c
@@ -42,7 +42,7 @@ const char *filename;
 const char *argv0;
 int gdbstub_port;
 envlist_t *envlist;
-const char *cpu_model;
+static const char *cpu_model;
 unsigned long mmap_min_addr;
 #if defined(CONFIG_USE_GUEST_BASE)
 unsigned long guest_base;
@@ -3287,7 +3287,7 @@ void init_task_state(TaskState *ts)
 
 CPUArchState *cpu_copy(CPUArchState *env)
 {
-    CPUArchState *new_env = cpu_init(env->cpu_model_str);
+    CPUArchState *new_env = cpu_init(cpu_model);
 #if defined(TARGET_HAS_ICE)
     CPUBreakpoint *bp;
     CPUWatchpoint *wp;
diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
@@ -131,7 +131,6 @@ static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model)
 AlphaCPU *cpu_alpha_init(const char *cpu_model)
 {
     AlphaCPU *cpu;
-    CPUAlphaState *env;
     ObjectClass *cpu_class;
 
     cpu_class = alpha_cpu_class_by_name(cpu_model);
@@ -140,9 +139,6 @@ AlphaCPU *cpu_alpha_init(const char *cpu_model)
         cpu_class = object_class_by_name(TYPE("ev67"));
     }
     cpu = ALPHA_CPU(object_new(object_class_get_name(cpu_class)));
-    env = &cpu->env;
-
-    env->cpu_model_str = cpu_model;
 
     object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
 
diff --git a/target-arm/helper.c b/target-arm/helper.c
@@ -1749,16 +1749,13 @@ void register_cp_regs_for_features(ARMCPU *cpu)
 ARMCPU *cpu_arm_init(const char *cpu_model)
 {
     ARMCPU *cpu;
-    CPUARMState *env;
     ObjectClass *oc;
 
     oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model);
     if (!oc) {
         return NULL;
     }
     cpu = ARM_CPU(object_new(object_class_get_name(oc)));
-    env = &cpu->env;
-    env->cpu_model_str = cpu_model;
 
     /* TODO this should be set centrally, once possible */
     object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
@@ -1899,7 +1899,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge,
                        Error **errp)
 {
     X86CPU *cpu = NULL;
-    CPUX86State *env;
     gchar **model_pieces;
     char *name, *features;
     char *typename;
@@ -1922,8 +1921,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge,
     qdev_set_parent_bus(DEVICE(cpu), qdev_get_child_bus(icc_bridge, "icc"));
     object_unref(OBJECT(cpu));
 #endif
-    env = &cpu->env;
-    env->cpu_model_str = cpu_model;
 
     cpu_x86_register(cpu, name, &error);
     if (error) {
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
@@ -110,7 +110,6 @@ M68kCPU *cpu_m68k_init(const char *cpu_model)
     }
     cpu = M68K_CPU(object_new(object_class_get_name(oc)));
     env = &cpu->env;
-    env->cpu_model_str = cpu_model;
 
     register_m68k_insns(env);
 
diff --git a/target-mips/translate.c b/target-mips/translate.c
@@ -15907,7 +15907,6 @@ MIPSCPU *cpu_mips_init(const char *cpu_model)
     cpu = MIPS_CPU(object_new(TYPE_MIPS_CPU));
     env = &cpu->env;
     env->cpu_model = def;
-    env->cpu_model_str = cpu_model;
 
 #ifndef CONFIG_USER_ONLY
     mmu_init(env, def);
diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
@@ -138,7 +138,6 @@ MoxieCPU *cpu_moxie_init(const char *cpu_model)
         return NULL;
     }
     cpu = MOXIE_CPU(object_new(object_class_get_name(oc)));
-    cpu->env.cpu_model_str = cpu_model;
 
     object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
 
diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
@@ -209,7 +209,6 @@ OpenRISCCPU *cpu_openrisc_init(const char *cpu_model)
         return NULL;
     }
     cpu = OPENRISC_CPU(object_new(object_class_get_name(oc)));
-    cpu->env.cpu_model_str = cpu_model;
 
     object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
 
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
@@ -8267,7 +8267,6 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
 PowerPCCPU *cpu_ppc_init(const char *cpu_model)
 {
     PowerPCCPU *cpu;
-    CPUPPCState *env;
     ObjectClass *oc;
     Error *err = NULL;
 
@@ -8277,8 +8276,6 @@ PowerPCCPU *cpu_ppc_init(const char *cpu_model)
     }
 
     cpu = POWERPC_CPU(object_new(object_class_get_name(oc)));
-    env = &cpu->env;
-    env->cpu_model_str = cpu_model;
 
     object_property_set_bool(OBJECT(cpu), true, "realized", &err);
     if (err != NULL) {
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
@@ -73,11 +73,8 @@ void s390x_cpu_timer(void *opaque)
 S390CPU *cpu_s390x_init(const char *cpu_model)
 {
     S390CPU *cpu;
-    CPUS390XState *env;
 
     cpu = S390_CPU(object_new(TYPE_S390_CPU));
-    env = &cpu->env;
-    env->cpu_model_str = cpu_model;
 
     object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
 
diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c
@@ -144,16 +144,13 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)
 SuperHCPU *cpu_sh4_init(const char *cpu_model)
 {
     SuperHCPU *cpu;
-    CPUSH4State *env;
     ObjectClass *oc;
 
     oc = superh_cpu_class_by_name(cpu_model);
     if (oc == NULL) {
         return NULL;
     }
     cpu = SUPERH_CPU(object_new(object_class_get_name(oc)));
-    env = &cpu->env;
-    env->cpu_model_str = cpu_model;
 
     object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
 
diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c
@@ -84,7 +84,6 @@ static int cpu_sparc_register(CPUSPARCState *env, const char *cpu_model)
         env->def->features |= CPU_FEATURE_FLOAT128;
     }
 #endif
-    env->cpu_model_str = cpu_model;
     env->version = def->iu_version;
     env->fsr = def->fpu_version;
     env->nwindows = def->nwindows;
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
@@ -37,7 +37,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
     }
     cpu = UNICORE32_CPU(object_new(object_class_get_name(oc)));
     env = &cpu->env;
-    env->cpu_model_str = cpu_model;
 
     object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,5 @@ typedef struct CPUWatchpoint {`
`178`	`178`	`\`
`179`	`179`	`/* user data */ \`
`180`	`180`	`void *opaque; \`
`181`		`- \`
`182`		`- const char *cpu_model_str;`
`183`	`181`
`184`	`182`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,6 @@ static ObjectClass alpha_cpu_class_by_name(const char cpu_model)`
`131`	`131`	`AlphaCPU cpu_alpha_init(const char cpu_model)`
`132`	`132`	`{`
`133`	`133`	`AlphaCPU *cpu;`
`134`		`- CPUAlphaState *env;`
`135`	`134`	`ObjectClass *cpu_class;`
`136`	`135`
`137`	`136`	`cpu_class = alpha_cpu_class_by_name(cpu_model);`
`@@ -140,9 +139,6 @@ AlphaCPU cpu_alpha_init(const char cpu_model)`
`140`	`139`	`cpu_class = object_class_by_name(TYPE("ev67"));`
`141`	`140`	`}`
`142`	`141`	`cpu = ALPHA_CPU(object_new(object_class_get_name(cpu_class)));`
`143`		`- env = &cpu->env;`
`144`		`-`
`145`		`- env->cpu_model_str = cpu_model;`
`146`	`142`
`147`	`143`	`object_property_set_bool(OBJECT(cpu), true, "realized", NULL);`
`148`	`144`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,6 @@ M68kCPU cpu_m68k_init(const char cpu_model)`
`110`	`110`	`}`
`111`	`111`	`cpu = M68K_CPU(object_new(object_class_get_name(oc)));`
`112`	`112`	`env = &cpu->env;`
`113`		`- env->cpu_model_str = cpu_model;`
`114`	`113`
`115`	`114`	`register_m68k_insns(env);`
`116`	`115`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ MoxieCPU cpu_moxie_init(const char cpu_model)`
`138`	`138`	`return NULL;`
`139`	`139`	`}`
`140`	`140`	`cpu = MOXIE_CPU(object_new(object_class_get_name(oc)));`
`141`		`- cpu->env.cpu_model_str = cpu_model;`
`142`	`141`
`143`	`142`	`object_property_set_bool(OBJECT(cpu), true, "realized", NULL);`
`144`	`143`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,6 @@ OpenRISCCPU cpu_openrisc_init(const char cpu_model)`
`209`	`209`	`return NULL;`
`210`	`210`	`}`
`211`	`211`	`cpu = OPENRISC_CPU(object_new(object_class_get_name(oc)));`
`212`		`- cpu->env.cpu_model_str = cpu_model;`
`213`	`212`
`214`	`213`	`object_property_set_bool(OBJECT(cpu), true, "realized", NULL);`
`215`	`214`
Original file line number	Diff line number	Diff line change
`@@ -8267,7 +8267,6 @@ static ObjectClass ppc_cpu_class_by_name(const char name)`
`8267`	`8267`	`PowerPCCPU cpu_ppc_init(const char cpu_model)`
`8268`	`8268`	`{`
`8269`	`8269`	`PowerPCCPU *cpu;`
`8270`		`- CPUPPCState *env;`
`8271`	`8270`	`ObjectClass *oc;`
`8272`	`8271`	`Error *err = NULL;`
`8273`	`8272`
`@@ -8277,8 +8276,6 @@ PowerPCCPU cpu_ppc_init(const char cpu_model)`
`8277`	`8276`	`}`
`8278`	`8277`
`8279`	`8278`	`cpu = POWERPC_CPU(object_new(object_class_get_name(oc)));`
`8280`		`- env = &cpu->env;`
`8281`		`- env->cpu_model_str = cpu_model;`
`8282`	`8279`
`8283`	`8280`	`object_property_set_bool(OBJECT(cpu), true, "realized", &err);`
`8284`	`8281`	`if (err != NULL) {`
Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,8 @@ void s390x_cpu_timer(void *opaque)`
`73`	`73`	`S390CPU cpu_s390x_init(const char cpu_model)`
`74`	`74`	`{`
`75`	`75`	`S390CPU *cpu;`
`76`		`- CPUS390XState *env;`
`77`	`76`
`78`	`77`	`cpu = S390_CPU(object_new(TYPE_S390_CPU));`
`79`		`- env = &cpu->env;`
`80`		`- env->cpu_model_str = cpu_model;`
`81`	`78`
`82`	`79`	`object_property_set_bool(OBJECT(cpu), true, "realized", NULL);`
`83`	`80`
Original file line number	Diff line number	Diff line change
`@@ -144,16 +144,13 @@ static ObjectClass superh_cpu_class_by_name(const char cpu_model)`
`144`	`144`	`SuperHCPU cpu_sh4_init(const char cpu_model)`
`145`	`145`	`{`
`146`	`146`	`SuperHCPU *cpu;`
`147`		`- CPUSH4State *env;`
`148`	`147`	`ObjectClass *oc;`
`149`	`148`
`150`	`149`	`oc = superh_cpu_class_by_name(cpu_model);`
`151`	`150`	`if (oc == NULL) {`
`152`	`151`	`return NULL;`
`153`	`152`	`}`
`154`	`153`	`cpu = SUPERH_CPU(object_new(object_class_get_name(oc)));`
`155`		`- env = &cpu->env;`
`156`		`- env->cpu_model_str = cpu_model;`
`157`	`154`
`158`	`155`	`object_property_set_bool(OBJECT(cpu), true, "realized", NULL);`
`159`	`156`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ static int cpu_sparc_register(CPUSPARCState env, const char cpu_model)`
`84`	`84`	`env->def->features \|= CPU_FEATURE_FLOAT128;`
`85`	`85`	`}`
`86`	`86`	`#endif`
`87`		`- env->cpu_model_str = cpu_model;`
`88`	`87`	`env->version = def->iu_version;`
`89`	`88`	`env->fsr = def->fpu_version;`
`90`	`89`	`env->nwindows = def->nwindows;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ CPUUniCore32State uc32_cpu_init(const char cpu_model)`
`37`	`37`	`}`
`38`	`38`	`cpu = UNICORE32_CPU(object_new(object_class_get_name(oc)));`
`39`	`39`	`env = &cpu->env;`
`40`		`- env->cpu_model_str = cpu_model;`
`41`	`40`
`42`	`41`	`object_property_set_bool(OBJECT(cpu), true, "realized", NULL);`
`43`	`42`