mirror of https://github.com/proxmox/mirror_qemu
target-ppc: Start QOM'ifying CPU init
Move code not dependent on ppc_def_t from cpu_ppc_init() into an initfn. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: David Gibson <david@gibson.dropbear.id.au>master
parent
1d0cb67da9
commit
6cca7ad686
|
@ -3196,10 +3196,11 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model)
|
||||||
|
|
||||||
cpu = POWERPC_CPU(object_new(TYPE_POWERPC_CPU));
|
cpu = POWERPC_CPU(object_new(TYPE_POWERPC_CPU));
|
||||||
env = &cpu->env;
|
env = &cpu->env;
|
||||||
cpu_exec_init(env);
|
|
||||||
if (tcg_enabled()) {
|
if (tcg_enabled()) {
|
||||||
ppc_translate_init();
|
ppc_translate_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
env->cpu_model_str = cpu_model;
|
env->cpu_model_str = cpu_model;
|
||||||
cpu_ppc_register_internal(env, def);
|
cpu_ppc_register_internal(env, def);
|
||||||
|
|
||||||
|
|
|
@ -10217,6 +10217,14 @@ static void ppc_cpu_reset(CPUState *s)
|
||||||
cpu_state_reset(env);
|
cpu_state_reset(env);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void ppc_cpu_initfn(Object *obj)
|
||||||
|
{
|
||||||
|
PowerPCCPU *cpu = POWERPC_CPU(obj);
|
||||||
|
CPUPPCState *env = &cpu->env;
|
||||||
|
|
||||||
|
cpu_exec_init(env);
|
||||||
|
}
|
||||||
|
|
||||||
static void ppc_cpu_class_init(ObjectClass *oc, void *data)
|
static void ppc_cpu_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
|
PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
|
||||||
|
@ -10230,6 +10238,7 @@ static const TypeInfo ppc_cpu_type_info = {
|
||||||
.name = TYPE_POWERPC_CPU,
|
.name = TYPE_POWERPC_CPU,
|
||||||
.parent = TYPE_CPU,
|
.parent = TYPE_CPU,
|
||||||
.instance_size = sizeof(PowerPCCPU),
|
.instance_size = sizeof(PowerPCCPU),
|
||||||
|
.instance_init = ppc_cpu_initfn,
|
||||||
.abstract = false,
|
.abstract = false,
|
||||||
.class_size = sizeof(PowerPCCPUClass),
|
.class_size = sizeof(PowerPCCPUClass),
|
||||||
.class_init = ppc_cpu_class_init,
|
.class_init = ppc_cpu_class_init,
|
||||||
|
|
Loading…
Reference in New Issue