cpu: Add Error argument to cpu_exec_init()

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 argument to abort in case of an error.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>

diff --git a/exec.c b/exec.c
index 442df0dd5bd0898673420f1d37a172539a0651d9..ce5fadd88a95e340a2c7c21a9366e01047522fa1 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -526,7 +526,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 2e74760ade90a68305adea79c8861762b20eedaa..44b89551c90e0c4d4ec9439de60c174072532b37 100644 (file)
--- 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);
 
 #if !defined(CONFIG_USER_ONLY)

diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index a98b7d8d7269aa17416ff80d34a1fdf627ab8f61..e865ba7aecdac096ef3d9c791d738ea7cf86de52 100644 (file)
--- 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 80669a6d1b76dcb9ebc00813dadd9b707dd4bdcd..1c40cc0395e20c42b1f600c8242b21ee6ea77e70 100644 (file)
--- 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;
 
     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 16cfba95fffd2d9a88e4e8ed6a4709cf813c4735..bb8e7ea55751db18fd41fb2d570f0ae69c69eb52 100644 (file)
--- 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 b4f94619693a87e20d1eea93ba2ad280f898edd1..4d0f7df04070b008afdb6a8b6223ca5e979ce130 100644 (file)
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -3038,7 +3038,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 f8081f52c1fb8b356306c479f3f6d8cc459ba52e..da4fde176e64e907b569c63ad4ab003fede3f947 100644 (file)
--- 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 4cfb7256c641893d7c0eb404a3bc517135928341..ae3d765046741bc991ef86ac84f06ecdf94baa06 100644 (file)
--- 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 c592bf76e41d747c8f50c7bf3b6520f9cf6c22c7..967ea015a9240c40156f21a73afd4e572688888c 100644 (file)
--- 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;
 
     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 958c999f0a1acaf38b387b0ccad0a8f86a07ea07..1fd9f22186867fe05e32537e3e29f4308c9323b9 100644 (file)
--- 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 47b617f5cd2aa733d287b5466af81758ae078e82..415c65a9691dd431027ab0265afc60c64f648bcc 100644 (file)
--- 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 39bedc108e498c30a6951b81f919cfefc405893d..cd6c657873efbdcd6c43c9cf754d3538d6e21655 100644 (file)
--- 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 d74f4f024d209d4f3ac70dabc8269e61bed5a2ea..52d95ce1b8f3c736c2ec992d70cccfe824408ddd 100644 (file)
--- 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 69bac3534957980d086a220e77227fed885aca54..ced5592204f3b110cb088b2715e501fcfa7045f3 100644 (file)
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -212,7 +212,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 cccb14fe7b9b17693e1edd01ad37cc20e7d0c7d4..2c2060b5a3b55f895ecd209cd8d3f5e5bcf55eb6 100644 (file)
--- 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);
+    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 a9520970964bb1672c08ff7f7fddfa7281b0d907..4d1da7c9de90d90ac17b588b9472798bff4da243 100644 (file)
--- 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 b3e5512bbfec62bc0946af1aace6cb31da021939..6fa60b1f30fd01f8e8dffa6506742f8b54528bc5 100644 (file)
--- 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);
+    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 5b3298717312b8168e04811f9da3776174922f01..eda039c60ec77c1e1a678654cfe6bf6ed5c828dc 100644 (file)
--- 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 2b7567899515bdc8a23cdb5e0dd699b678ef8465..8d69d237d1b4d0566ec132141428a230d1625331 100644 (file)
--- 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;