From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCFaj-0005Gf-It for qemu-devel@nongnu.org; Mon, 06 Jul 2015 19:14:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCFaf-0007ii-9J for qemu-devel@nongnu.org; Mon, 06 Jul 2015 19:14:25 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 7 Jul 2015 01:13:53 +0200 Message-Id: <1436224445-19449-11-git-send-email-afaerber@suse.de> In-Reply-To: <1436224445-19449-1-git-send-email-afaerber@suse.de> References: <1436224445-19449-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 10/22] cpu: Change cpu_exec_init() arg to cpu, not env List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Guan Xuetao , Eduardo Habkost , Peter Crosthwaite , Jia Liu , Anthony Green , Mark Cave-Ayland , Michael Walle , Alexander Graf , Blue Swirl , Max Filippov , Peter Crosthwaite , "open list:PowerPC" , "Edgar E. Iglesias" , Paolo Bonzini , Bastian Koppelmann , Leon Alrae , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Richard Henderson From: Peter Crosthwaite The callers (most of them in target-foo/cpu.c) to this function all have the cpu pointer handy. Just pass it to avoid an ENV_GET_CPU() from core code (in exec.c). Cc: Paolo Bonzini Cc: Richard Henderson Cc: Peter Maydell Cc: "Edgar E. Iglesias" Cc: Eduardo Habkost Cc: Michael Walle Cc: Leon Alrae Cc: Anthony Green Cc: Jia Liu Cc: Alexander Graf Cc: Blue Swirl Cc: Mark Cave-Ayland Cc: Bastian Koppelmann Cc: Guan Xuetao Cc: Max Filippov Reviewed-by: Andreas F=C3=A4rber Reviewed-by: Aurelien Jarno Signed-off-by: Peter Crosthwaite Signed-off-by: Andreas F=C3=A4rber --- exec.c | 5 ++--- include/exec/exec-all.h | 2 +- target-alpha/cpu.c | 2 +- target-arm/cpu.c | 2 +- target-cris/cpu.c | 2 +- target-i386/cpu.c | 2 +- target-lm32/cpu.c | 2 +- target-m68k/cpu.c | 2 +- target-microblaze/cpu.c | 2 +- target-mips/cpu.c | 2 +- target-moxie/cpu.c | 2 +- target-openrisc/cpu.c | 2 +- target-ppc/translate_init.c | 2 +- target-s390x/cpu.c | 2 +- target-sh4/cpu.c | 2 +- target-sparc/cpu.c | 2 +- target-tricore/cpu.c | 2 +- target-unicore32/cpu.c | 2 +- target-xtensa/cpu.c | 2 +- 19 files changed, 20 insertions(+), 21 deletions(-) diff --git a/exec.c b/exec.c index a33d9b2..7cc9f50 100644 --- a/exec.c +++ b/exec.c @@ -571,9 +571,8 @@ void cpu_exec_exit(CPUState *cpu) } #endif =20 -void cpu_exec_init(CPUArchState *env, Error **errp) +void cpu_exec_init(CPUState *cpu, Error **errp) { - CPUState *cpu =3D ENV_GET_CPU(env); CPUClass *cc =3D CPU_GET_CLASS(cpu); int cpu_index; Error *local_err =3D NULL; @@ -601,7 +600,7 @@ void cpu_exec_init(CPUArchState *env, Error **errp) } #if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY) register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION, - cpu_save, cpu_load, env); + cpu_save, cpu_load, cpu->env_ptr); assert(cc->vmsd =3D=3D NULL); assert(qdev_get_vmsd(DEVICE(cpu)) =3D=3D NULL); #endif diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 5a73bcb..05c6185 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -88,7 +88,7 @@ void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uint= ptr_t retaddr); TranslationBlock *tb_gen_code(CPUState *cpu, target_ulong pc, target_ulong cs_base, int= flags, int cflags); -void cpu_exec_init(CPUArchState *env, Error **errp); +void cpu_exec_init(CPUState *cpu, Error **errp); void QEMU_NORETURN cpu_loop_exit(CPUState *cpu); =20 #if !defined(CONFIG_USER_ONLY) diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c index e865ba7..421d7e5 100644 --- a/target-alpha/cpu.c +++ b/target-alpha/cpu.c @@ -257,7 +257,7 @@ static void alpha_cpu_initfn(Object *obj) CPUAlphaState *env =3D &cpu->env; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); tlb_flush(cs, 1); =20 alpha_translate_init(); diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 1c40cc0..5a8cdb5 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -392,7 +392,7 @@ static void arm_cpu_initfn(Object *obj) uint32_t Aff1, Aff0; =20 cs->env_ptr =3D &cpu->env; - cpu_exec_init(&cpu->env, &error_abort); + cpu_exec_init(cs, &error_abort); cpu->cp_regs =3D g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); =20 diff --git a/target-cris/cpu.c b/target-cris/cpu.c index bb8e7ea..0db209b 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -170,7 +170,7 @@ static void cris_cpu_initfn(Object *obj) static bool tcg_initialized; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 env->pregs[PR_VR] =3D ccc->vr; =20 diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 433f38b..a35b045 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3007,7 +3007,7 @@ static void x86_cpu_initfn(Object *obj) static int inited; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 object_property_add(obj, "family", "int", x86_cpuid_version_get_family, diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c index da4fde1..c2b77c6 100644 --- a/target-lm32/cpu.c +++ b/target-lm32/cpu.c @@ -151,7 +151,7 @@ static void lm32_cpu_initfn(Object *obj) static bool tcg_initialized; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 env->flags =3D 0; =20 diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index ae3d765..4f246da 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -168,7 +168,7 @@ static void m68k_cpu_initfn(Object *obj) static bool inited; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 if (tcg_enabled() && !inited) { inited =3D true; diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c index 967ea01..128d032 100644 --- a/target-microblaze/cpu.c +++ b/target-microblaze/cpu.c @@ -190,7 +190,7 @@ static void mb_cpu_initfn(Object *obj) static bool tcg_initialized; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 set_float_rounding_mode(float_round_nearest_even, &env->fp_status); =20 diff --git a/target-mips/cpu.c b/target-mips/cpu.c index 1fd9f22..4027d0f 100644 --- a/target-mips/cpu.c +++ b/target-mips/cpu.c @@ -115,7 +115,7 @@ static void mips_cpu_initfn(Object *obj) CPUMIPSState *env =3D &cpu->env; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 if (tcg_enabled()) { mips_tcg_init(); diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c index 415c65a..6b035aa 100644 --- a/target-moxie/cpu.c +++ b/target-moxie/cpu.c @@ -66,7 +66,7 @@ static void moxie_cpu_initfn(Object *obj) static int inited; =20 cs->env_ptr =3D &cpu->env; - cpu_exec_init(&cpu->env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 if (tcg_enabled() && !inited) { inited =3D 1; diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c index cd6c657..d97f3c0 100644 --- a/target-openrisc/cpu.c +++ b/target-openrisc/cpu.c @@ -92,7 +92,7 @@ static void openrisc_cpu_initfn(Object *obj) static int inited; =20 cs->env_ptr =3D &cpu->env; - cpu_exec_init(&cpu->env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 #ifndef CONFIG_USER_ONLY cpu_openrisc_mmu_init(cpu); diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 2b72f2d..b95ac68 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8928,7 +8928,7 @@ static void ppc_cpu_realizefn(DeviceState *dev, Err= or **errp) return; } =20 - cpu_exec_init(&cpu->env, &local_err); + cpu_exec_init(cs, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); return; diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index ced5592..c3e21b4 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -212,7 +212,7 @@ static void s390_cpu_initfn(Object *obj) #endif =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); #if !defined(CONFIG_USER_ONLY) qemu_register_reset(s390_cpu_machine_reset_cb, cpu); qemu_get_timedate(&tm, 0); diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c index 2c2060b..5c65ab4 100644 --- a/target-sh4/cpu.c +++ b/target-sh4/cpu.c @@ -248,7 +248,7 @@ static void superh_cpu_initfn(Object *obj) CPUSH4State *env =3D &cpu->env; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 env->movcal_backup_tail =3D &(env->movcal_backup); =20 diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 4d1da7c..9528e3a 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -802,7 +802,7 @@ static void sparc_cpu_initfn(Object *obj) CPUSPARCState *env =3D &cpu->env; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 if (tcg_enabled()) { gen_intermediate_code_init(env); diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c index 6fa60b1..2029ef6 100644 --- a/target-tricore/cpu.c +++ b/target-tricore/cpu.c @@ -92,7 +92,7 @@ static void tricore_cpu_initfn(Object *obj) CPUTriCoreState *env =3D &cpu->env; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 if (tcg_enabled()) { tricore_tcg_init(); diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c index eda039c..fc451a1 100644 --- a/target-unicore32/cpu.c +++ b/target-unicore32/cpu.c @@ -111,7 +111,7 @@ static void uc32_cpu_initfn(Object *obj) static bool inited; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 #ifdef CONFIG_USER_ONLY env->uncached_asr =3D ASR_MODE_USER; diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c index 8d69d23..da8129d 100644 --- a/target-xtensa/cpu.c +++ b/target-xtensa/cpu.c @@ -114,7 +114,7 @@ static void xtensa_cpu_initfn(Object *obj) =20 cs->env_ptr =3D env; env->config =3D xcc->config; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); =20 if (tcg_enabled() && !tcg_inited) { tcg_inited =3D true; --=20 2.1.4