Skip to content

Commit

Permalink
target-xtensa: Introduce QOM realizefn for XtensaCPU
Browse files Browse the repository at this point in the history
Introduce realizefn and set realized = true in cpu_xtensa_init().

Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
afaerber committed Jan 20, 2013
1 parent be5bbae commit 0d09106
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
2 changes: 2 additions & 0 deletions target-xtensa/cpu-qom.h
Expand Up @@ -43,6 +43,7 @@

/**
* XtensaCPUClass:
* @parent_realize: The parent class' realize handler.
* @parent_reset: The parent class' reset handler.
*
* An Xtensa CPU model.
Expand All @@ -52,6 +53,7 @@ typedef struct XtensaCPUClass {
CPUClass parent_class;
/*< public >*/

DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu);
} XtensaCPUClass;

Expand Down
14 changes: 14 additions & 0 deletions target-xtensa/cpu.c
Expand Up @@ -56,6 +56,16 @@ static void xtensa_cpu_reset(CPUState *s)
reset_mmu(env);
}

static void xtensa_cpu_realizefn(DeviceState *dev, Error **errp)
{
XtensaCPU *cpu = XTENSA_CPU(dev);
XtensaCPUClass *xcc = XTENSA_CPU_GET_CLASS(dev);

qemu_init_vcpu(&cpu->env);

xcc->parent_realize(dev, errp);
}

static void xtensa_cpu_initfn(Object *obj)
{
XtensaCPU *cpu = XTENSA_CPU(obj);
Expand All @@ -66,9 +76,13 @@ static void xtensa_cpu_initfn(Object *obj)

static void xtensa_cpu_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
CPUClass *cc = CPU_CLASS(oc);
XtensaCPUClass *xcc = XTENSA_CPU_CLASS(cc);

xcc->parent_realize = dc->realize;
dc->realize = xtensa_cpu_realizefn;

xcc->parent_reset = cc->reset;
cc->reset = xtensa_cpu_reset;
}
Expand Down
4 changes: 3 additions & 1 deletion target-xtensa/helper.c
Expand Up @@ -104,7 +104,9 @@ XtensaCPU *cpu_xtensa_init(const char *cpu_model)
}

xtensa_irq_init(env);
qemu_init_vcpu(env);

object_property_set_bool(OBJECT(cpu), true, "realized", NULL);

return cpu;
}

Expand Down

0 comments on commit 0d09106

Please sign in to comment.