mirror of https://github.com/proxmox/mirror_qemu
target-mips: Move TCG initialization to MIPSCPU initfn
Make mips_tcg_init() non-static and add tcg_enabled() check to suppress it for qtest. Signed-off-by: Andreas Färber <afaerber@suse.de>master
parent
cd0c24f909
commit
78ce64f492
|
@ -59,6 +59,10 @@ static void mips_cpu_initfn(Object *obj)
|
||||||
CPUMIPSState *env = &cpu->env;
|
CPUMIPSState *env = &cpu->env;
|
||||||
|
|
||||||
cpu_exec_init(env);
|
cpu_exec_init(env);
|
||||||
|
|
||||||
|
if (tcg_enabled()) {
|
||||||
|
mips_tcg_init();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mips_cpu_class_init(ObjectClass *c, void *data)
|
static void mips_cpu_class_init(ObjectClass *c, void *data)
|
||||||
|
|
|
@ -629,6 +629,7 @@ enum {
|
||||||
#define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0
|
#define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0
|
||||||
|
|
||||||
int cpu_mips_exec(CPUMIPSState *s);
|
int cpu_mips_exec(CPUMIPSState *s);
|
||||||
|
void mips_tcg_init(void);
|
||||||
MIPSCPU *cpu_mips_init(const char *cpu_model);
|
MIPSCPU *cpu_mips_init(const char *cpu_model);
|
||||||
int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);
|
int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);
|
||||||
|
|
||||||
|
|
|
@ -15836,7 +15836,7 @@ void cpu_dump_state (CPUMIPSState *env, FILE *f, fprintf_function cpu_fprintf,
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mips_tcg_init(void)
|
void mips_tcg_init(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
static int inited;
|
static int inited;
|
||||||
|
@ -15915,7 +15915,6 @@ MIPSCPU *cpu_mips_init(const char *cpu_model)
|
||||||
#endif
|
#endif
|
||||||
fpu_init(env, def);
|
fpu_init(env, def);
|
||||||
mvp_init(env, def);
|
mvp_init(env, def);
|
||||||
mips_tcg_init();
|
|
||||||
|
|
||||||
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
|
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue