On Wed, May 20, 2015 at 10:02 PM, Bharata B Rao
<bhar...@linux.vnet.ibm.com> wrote:
> Add an Error argument to cpu_exec_init() to let users collect the
> error. This is in preparation to change the CPU enumeration logic
> in cpu_exec_init(). With the new enumeration logic, cpu_exec_init()
> can fail if cpu_index values corresponding to max_cpus have already
> been handed out.
>
> Since all current callers of cpu_exec_init() are from instance_init,
> use error_abort Error arugment to abort in case of an error.
>
> Signed-off-by: Bharata B Rao <bhar...@linux.vnet.ibm.com>
> Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwa...@xilinx.com>
> ---
> exec.c | 2 +-
> 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, 19 insertions(+), 19 deletions(-)
>
> diff --git a/exec.c b/exec.c
> index e19ab22..5cf821e 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -518,7 +518,7 @@ void tcg_cpu_address_space_init(CPUState *cpu,
> AddressSpace *as)
> }
> #endif
>
> -void cpu_exec_init(CPUArchState *env)
> +void cpu_exec_init(CPUArchState *env, Error **errp)
> {
> CPUState *cpu = ENV_GET_CPU(env);
> CPUClass *cc = CPU_GET_CLASS(cpu);
> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
> index b58cd47..0a3a504 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);
> +void cpu_exec_init(CPUArchState *env, Error **errp);
> void QEMU_NORETURN cpu_loop_exit(CPUState *cpu);
> int page_unprotect(target_ulong address, uintptr_t pc, void *puc);
> void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,
> diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
> index a98b7d8..e865ba7 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);
> + cpu_exec_init(env, &error_abort);
> tlb_flush(cs, 1);
>
> alpha_translate_init();
> diff --git a/target-arm/cpu.c b/target-arm/cpu.c
> index 3ca3fa8..04a79bc 100644
> --- a/target-arm/cpu.c
> +++ b/target-arm/cpu.c
> @@ -369,7 +369,7 @@ static void arm_cpu_initfn(Object *obj)
> static bool inited;
>
> cs->env_ptr = &cpu->env;
> - cpu_exec_init(&cpu->env);
> + cpu_exec_init(&cpu->env, &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 16cfba9..bb8e7ea 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;
>
> cs->env_ptr = env;
> - cpu_exec_init(env);
> + cpu_exec_init(env, &error_abort);
>
> env->pregs[PR_VR] = ccc->vr;
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 3305e09..5f3822f 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -2850,7 +2850,7 @@ static void x86_cpu_initfn(Object *obj)
> static int inited;
>
> cs->env_ptr = env;
> - cpu_exec_init(env);
> + cpu_exec_init(env, &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 f8081f5..da4fde1 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);
> + cpu_exec_init(env, &error_abort);
>
> env->flags = 0;
>
> diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
> index 4cfb725..ae3d765 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);
> + cpu_exec_init(env, &error_abort);
>
> if (tcg_enabled() && !inited) {
> inited = true;
> diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c
> index 67e3182..eac4de0 100644
> --- a/target-microblaze/cpu.c
> +++ b/target-microblaze/cpu.c
> @@ -130,7 +130,7 @@ static void mb_cpu_initfn(Object *obj)
> static bool tcg_initialized;
>
> cs->env_ptr = env;
> - cpu_exec_init(env);
> + cpu_exec_init(env, &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 958c999..1fd9f22 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);
> + cpu_exec_init(env, &error_abort);
>
> if (tcg_enabled()) {
> mips_tcg_init();
> diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
> index 47b617f..415c65a 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);
> + cpu_exec_init(&cpu->env, &error_abort);
>
> if (tcg_enabled() && !inited) {
> inited = 1;
> diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
> index 39bedc1..cd6c657 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);
> + cpu_exec_init(&cpu->env, &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 d74f4f0..52d95ce 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -9633,7 +9633,7 @@ static void ppc_cpu_initfn(Object *obj)
> CPUPPCState *env = &cpu->env;
>
> cs->env_ptr = env;
> - cpu_exec_init(env);
> + cpu_exec_init(env, &error_abort);
> cpu->cpu_dt_id = cs->cpu_index;
>
> env->msr_mask = pcc->msr_mask;
> diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
> index d2f9836..b5225a1 100644
> --- a/target-s390x/cpu.c
> +++ b/target-s390x/cpu.c
> @@ -187,7 +187,7 @@ static void s390_cpu_initfn(Object *obj)
> #endif
>
> cs->env_ptr = env;
> - cpu_exec_init(env);
> + cpu_exec_init(env, &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 d187a2b..c988adf 100644
> --- a/target-sh4/cpu.c
> +++ b/target-sh4/cpu.c
> @@ -247,7 +247,7 @@ static void superh_cpu_initfn(Object *obj)
> CPUSH4State *env = &cpu->env;
>
> cs->env_ptr = env;
> - cpu_exec_init(env);
> + cpu_exec_init(env, &error_abort);
>
> env->movcal_backup_tail = &(env->movcal_backup);
>
> diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c
> index a952097..4d1da7c 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);
> + cpu_exec_init(env, &error_abort);
>
> if (tcg_enabled()) {
> gen_intermediate_code_init(env);
> diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c
> index 2ba0cf4..8505a45 100644
> --- a/target-tricore/cpu.c
> +++ b/target-tricore/cpu.c
> @@ -88,7 +88,7 @@ static void tricore_cpu_initfn(Object *obj)
> CPUTriCoreState *env = &cpu->env;
>
> cs->env_ptr = env;
> - cpu_exec_init(env);
> + cpu_exec_init(env, &error_abort);
>
> if (tcg_enabled()) {
> tricore_tcg_init();
> diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
> index 5b32987..eda039c 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);
> + cpu_exec_init(env, &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 2b75678..8d69d23 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);
> + cpu_exec_init(env, &error_abort);
>
> if (tcg_enabled() && !tcg_inited) {
> tcg_inited = true;
> --
> 2.1.0
>
>
