From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTrLb-0008Cp-VH for qemu-devel@nongnu.org; Wed, 09 Oct 2013 06:50:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTrLV-0006ET-KI for qemu-devel@nongnu.org; Wed, 09 Oct 2013 06:50:31 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 9 Oct 2013 12:49:24 +0200 Message-Id: <1381315764-2814-6-git-send-email-afaerber@suse.de> In-Reply-To: <1381315764-2814-1-git-send-email-afaerber@suse.de> References: <1381315764-2814-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 5/5] cpu: Drop cpu_model_str from CPU_COMMON List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jia Liu , Anthony Green , Riku Voipio , Alexander Graf , Blue Swirl , "open list:PowerPC" , Paul Brook , Guan Xuetao , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Richard Henderson 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=C3=A4rber --- include/exec/cpu-defs.h | 2 -- linux-user/main.c | 4 ++-- target-alpha/cpu.c | 4 ---- target-arm/helper.c | 3 --- target-i386/cpu.c | 3 --- target-m68k/helper.c | 1 - target-mips/translate.c | 1 - target-moxie/cpu.c | 1 - target-openrisc/cpu.c | 1 - target-ppc/translate_init.c | 3 --- target-s390x/helper.c | 3 --- target-sh4/cpu.c | 3 --- target-sparc/cpu.c | 1 - target-unicore32/helper.c | 1 - 14 files changed, 2 insertions(+), 29 deletions(-) diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index a5c028c..01cd8c7 100644 --- 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; =20 #endif diff --git a/linux-user/main.c b/linux-user/main.c index 5fe587b..6b4ab09 100644 --- 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) =20 CPUArchState *cpu_copy(CPUArchState *env) { - CPUArchState *new_env =3D cpu_init(env->cpu_model_str); + CPUArchState *new_env =3D 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 index cfad2ea..a0d5d5b 100644 --- a/target-alpha/cpu.c +++ b/target-alpha/cpu.c @@ -131,7 +131,6 @@ static ObjectClass *alpha_cpu_class_by_name(const cha= r *cpu_model) AlphaCPU *cpu_alpha_init(const char *cpu_model) { AlphaCPU *cpu; - CPUAlphaState *env; ObjectClass *cpu_class; =20 cpu_class =3D alpha_cpu_class_by_name(cpu_model); @@ -140,9 +139,6 @@ AlphaCPU *cpu_alpha_init(const char *cpu_model) cpu_class =3D object_class_by_name(TYPE("ev67")); } cpu =3D ALPHA_CPU(object_new(object_class_get_name(cpu_class))); - env =3D &cpu->env; - - env->cpu_model_str =3D cpu_model; =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 diff --git a/target-arm/helper.c b/target-arm/helper.c index 2a98be7..c63bbd7 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1749,7 +1749,6 @@ void register_cp_regs_for_features(ARMCPU *cpu) ARMCPU *cpu_arm_init(const char *cpu_model) { ARMCPU *cpu; - CPUARMState *env; ObjectClass *oc; =20 oc =3D cpu_class_by_name(TYPE_ARM_CPU, cpu_model); @@ -1757,8 +1756,6 @@ ARMCPU *cpu_arm_init(const char *cpu_model) return NULL; } cpu =3D ARM_CPU(object_new(object_class_get_name(oc))); - env =3D &cpu->env; - env->cpu_model_str =3D cpu_model; =20 /* 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 index c1c994f..d0c9bdb 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1899,7 +1899,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, Devic= eState *icc_bridge, Error **errp) { X86CPU *cpu =3D NULL; - CPUX86State *env; gchar **model_pieces; char *name, *features; char *typename; @@ -1922,8 +1921,6 @@ X86CPU *cpu_x86_create(const char *cpu_model, Devic= eState *icc_bridge, qdev_set_parent_bus(DEVICE(cpu), qdev_get_child_bus(icc_bridge, "icc= ")); object_unref(OBJECT(cpu)); #endif - env =3D &cpu->env; - env->cpu_model_str =3D cpu_model; =20 cpu_x86_register(cpu, name, &error); if (error) { diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 00a7a08..a8f32fc 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -110,7 +110,6 @@ M68kCPU *cpu_m68k_init(const char *cpu_model) } cpu =3D M68K_CPU(object_new(object_class_get_name(oc))); env =3D &cpu->env; - env->cpu_model_str =3D cpu_model; =20 register_m68k_insns(env); =20 diff --git a/target-mips/translate.c b/target-mips/translate.c index ad43d59..dea3956 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -15907,7 +15907,6 @@ MIPSCPU *cpu_mips_init(const char *cpu_model) cpu =3D MIPS_CPU(object_new(TYPE_MIPS_CPU)); env =3D &cpu->env; env->cpu_model =3D def; - env->cpu_model_str =3D cpu_model; =20 #ifndef CONFIG_USER_ONLY mmu_init(env, def); diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c index d97a091..484ecc2 100644 --- 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 =3D MOXIE_CPU(object_new(object_class_get_name(oc))); - cpu->env.cpu_model_str =3D cpu_model; =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c index 075f00a..8137943 100644 --- 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 =3D OPENRISC_CPU(object_new(object_class_get_name(oc))); - cpu->env.cpu_model_str =3D cpu_model; =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index d2645ba..651da6b 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8267,7 +8267,6 @@ static ObjectClass *ppc_cpu_class_by_name(const cha= r *name) PowerPCCPU *cpu_ppc_init(const char *cpu_model) { PowerPCCPU *cpu; - CPUPPCState *env; ObjectClass *oc; Error *err =3D NULL; =20 @@ -8277,8 +8276,6 @@ PowerPCCPU *cpu_ppc_init(const char *cpu_model) } =20 cpu =3D POWERPC_CPU(object_new(object_class_get_name(oc))); - env =3D &cpu->env; - env->cpu_model_str =3D cpu_model; =20 object_property_set_bool(OBJECT(cpu), true, "realized", &err); if (err !=3D NULL) { diff --git a/target-s390x/helper.c b/target-s390x/helper.c index 61abfd7..da33b38 100644 --- 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; =20 cpu =3D S390_CPU(object_new(TYPE_S390_CPU)); - env =3D &cpu->env; - env->cpu_model_str =3D cpu_model; =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c index 34b2b57..c23294d 100644 --- a/target-sh4/cpu.c +++ b/target-sh4/cpu.c @@ -144,7 +144,6 @@ static ObjectClass *superh_cpu_class_by_name(const ch= ar *cpu_model) SuperHCPU *cpu_sh4_init(const char *cpu_model) { SuperHCPU *cpu; - CPUSH4State *env; ObjectClass *oc; =20 oc =3D superh_cpu_class_by_name(cpu_model); @@ -152,8 +151,6 @@ SuperHCPU *cpu_sh4_init(const char *cpu_model) return NULL; } cpu =3D SUPERH_CPU(object_new(object_class_get_name(oc))); - env =3D &cpu->env; - env->cpu_model_str =3D cpu_model; =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 47ce60d..e7f878e 100644 --- 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 |=3D CPU_FEATURE_FLOAT128; } #endif - env->cpu_model_str =3D cpu_model; env->version =3D def->iu_version; env->fsr =3D def->fpu_version; env->nwindows =3D def->nwindows; diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c index 61eb2c3..9bf4fea 100644 --- a/target-unicore32/helper.c +++ b/target-unicore32/helper.c @@ -37,7 +37,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model) } cpu =3D UNICORE32_CPU(object_new(object_class_get_name(oc))); env =3D &cpu->env; - env->cpu_model_str =3D cpu_model; =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 --=20 1.8.1.4