From patchwork Tue Jun 16 07:42:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 484815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42273140297 for ; Tue, 16 Jun 2015 17:44:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=AwlKYzNX; dkim-atps=neutral Received: from localhost ([::1]:38368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lXU-0004iv-EP for incoming@patchwork.ozlabs.org; Tue, 16 Jun 2015 03:44:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lVp-00027H-N6 for qemu-devel@nongnu.org; Tue, 16 Jun 2015 03:42:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4lVm-0006TO-1o for qemu-devel@nongnu.org; Tue, 16 Jun 2015 03:42:25 -0400 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:35988) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lVl-0006Su-Nf for qemu-devel@nongnu.org; Tue, 16 Jun 2015 03:42:21 -0400 Received: by pabqy3 with SMTP id qy3so7603863pab.3 for ; Tue, 16 Jun 2015 00:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=HqWtXinRvTPZuKOxgq3kNZHeMQ5GBmJfIwT00uPCKp0=; b=AwlKYzNXbjyNNTWEdO4aJEdBh3mbJ9dOvsbP0rmPdITHFbbTEsCQeCBOOrV/EWW/6i zUJe45JzZBSYsBWzp40ux3B5vhDj7I25mZ5Qk2STvVS7+5wH30W5c+xtliacP7b/LTQz TJiL3LuS3awzV1cSHJ1l+OVzGy5u2jpSd0w6ksqzRlaW1BXGgLXG4WbCLZG5Pp3YTPUt 3vqGJQryYise6Dw+xoEcjvMWPe3Bh4pwkl6OK7Z5UisG4QHtul6tSpvObajf3wz/AnxH pOkfGDdBr/rTOD5UrP9PpGzYO24E6gWrI/Eev//V+ppGDq2zQFviF1w3oAYRzxd342tW tMvg== X-Received: by 10.68.133.131 with SMTP id pc3mr55700054pbb.107.1434440541030; Tue, 16 Jun 2015 00:42:21 -0700 (PDT) Received: from pcrost-laptop.hsd1.ca.comcast.net (c-73-15-58-35.hsd1.ca.comcast.net. [73.15.58.35]) by mx.google.com with ESMTPSA id pf10sm315653pbc.24.2015.06.16.00.42.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Jun 2015 00:42:19 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Tue, 16 Jun 2015 00:42:00 -0700 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22a Cc: Peter Maydell , Guan Xuetao , Eduardo Habkost , Peter Crosthwaite , Jia Liu , Anthony Green , Mark Cave-Ayland , Alexander Graf , Blue Swirl , Max Filippov , Michael Walle , "Edgar E. Iglesias" , Paolo Bonzini , Bastian Koppelmann , Leon Alrae , afaerber@suse.de, Aurelien Jarno , rth@twiddle.net Subject: [Qemu-devel] [PATCH v2 4/5] cpus: Change exec_init() arg to cpu, not env X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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: "Andreas Färber" Cc: Eduardo Habkost Cc: Michael Walle Cc: Aurelien Jarno 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ärber Signed-off-by: Peter Crosthwaite Reviewed-by: Aurelien Jarno --- changed since v1: Add () to function in commit message. Rebase on Bharata's Error ** patch --- exec.c | 4 ++-- 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(+), 20 deletions(-) diff --git a/exec.c b/exec.c index b1c8aae..7fc1950 100644 --- a/exec.c +++ b/exec.c @@ -554,9 +554,8 @@ void cpu_exec_exit(CPUState *cpu) } #endif -void cpu_exec_init(CPUArchState *env, Error **errp) +void cpu_exec_init(CPUState *cpu, Error **errp) { - CPUState *cpu = ENV_GET_CPU(env); CPUClass *cc = CPU_GET_CLASS(cpu); int cpu_index; Error *local_err = NULL; @@ -585,6 +584,7 @@ void cpu_exec_init(CPUArchState *env, Error **errp) vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu); } #if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY) + CPUArchState *env = cpu->env_ptr; register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION, cpu_save, cpu_load, env); assert(cc->vmsd == NULL); diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index cffd21e..4bf13e0 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, uintptr_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 *env, Error **errp); void QEMU_NORETURN cpu_loop_exit(CPUState *cpu); #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 = &cpu->env; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); tlb_flush(cs, 1); alpha_translate_init(); diff --git a/target-arm/cpu.c b/target-arm/cpu.c index c0a8384..62c4e20 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -423,7 +423,7 @@ static void arm_cpu_initfn(Object *obj) static bool inited; cs->env_ptr = &cpu->env; - cpu_exec_init(&cpu->env, &error_abort); + cpu_exec_init(cs, &error_abort); cpu->cp_regs = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); diff --git a/target-cris/cpu.c b/target-cris/cpu.c index 4606901..b17e849 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -184,7 +184,7 @@ static void cris_cpu_initfn(Object *obj) static bool tcg_initialized; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); env->pregs[PR_VR] = ccc->vr; diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 643b390..0a808c9 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; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); 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; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); env->flags = 0; 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; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); if (tcg_enabled() && !inited) { inited = true; diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c index 6469ac5..cd37dde 100644 --- a/target-microblaze/cpu.c +++ b/target-microblaze/cpu.c @@ -136,7 +136,7 @@ static void mb_cpu_initfn(Object *obj) static bool tcg_initialized; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); set_float_rounding_mode(float_round_nearest_even, &env->fp_status); 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 = &cpu->env; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); 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; cs->env_ptr = &cpu->env; - cpu_exec_init(&cpu->env, &error_abort); + cpu_exec_init(cs, &error_abort); if (tcg_enabled() && !inited) { inited = 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; cs->env_ptr = &cpu->env; - cpu_exec_init(&cpu->env, &error_abort); + cpu_exec_init(cs, &error_abort); #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, Error **errp) return; } - cpu_exec_init(&cpu->env, &local_err); + cpu_exec_init(cs, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); return; diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index b428115..355b647 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -195,7 +195,7 @@ static void s390_cpu_initfn(Object *obj) #endif cs->env_ptr = 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 = &cpu->env; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); env->movcal_backup_tail = &(env->movcal_backup); 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 = &cpu->env; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); 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 = &cpu->env; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); 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; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); #ifdef CONFIG_USER_ONLY env->uncached_asr = 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) cs->env_ptr = env; env->config = xcc->config; - cpu_exec_init(env, &error_abort); + cpu_exec_init(cs, &error_abort); if (tcg_enabled() && !tcg_inited) { tcg_inited = true;