[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC qom-cpu v2 07/28] target-cris: Introduce QOM reali
From: |
Eduardo Habkost |
Subject: |
Re: [Qemu-devel] [RFC qom-cpu v2 07/28] target-cris: Introduce QOM realizefn for CRISCPU |
Date: |
Thu, 7 Feb 2013 14:32:30 -0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Sun, Jan 20, 2013 at 08:22:30AM +0100, Andreas Färber wrote:
> Introduce realizefn and set realized = true from cpu_cris_init().
>
> Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
> ---
> target-cris/cpu-qom.h | 2 ++
> target-cris/cpu.c | 15 +++++++++++++++
> target-cris/translate.c | 3 +--
> 3 Dateien geändert, 18 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
>
> diff --git a/target-cris/cpu-qom.h b/target-cris/cpu-qom.h
> index 41ab9b2..7ad8398 100644
> --- a/target-cris/cpu-qom.h
> +++ b/target-cris/cpu-qom.h
> @@ -33,6 +33,7 @@
>
> /**
> * CRISCPUClass:
> + * @parent_realize: The parent class' realize handler.
> * @parent_reset: The parent class' reset handler.
> *
> * A CRIS CPU model.
> @@ -42,6 +43,7 @@ typedef struct CRISCPUClass {
> CPUClass parent_class;
> /*< public >*/
>
> + DeviceRealize parent_realize;
> void (*parent_reset)(CPUState *cpu);
> } CRISCPUClass;
>
> diff --git a/target-cris/cpu.c b/target-cris/cpu.c
> index 3f64a57..34c4f75 100644
> --- a/target-cris/cpu.c
> +++ b/target-cris/cpu.c
> @@ -55,6 +55,17 @@ static void cris_cpu_reset(CPUState *s)
> #endif
> }
>
> +static void cris_cpu_realizefn(DeviceState *dev, Error **errp)
> +{
> + CRISCPU *cpu = CRIS_CPU(dev);
> + CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(dev);
> +
> + cpu_reset(CPU(cpu));
> + qemu_init_vcpu(&cpu->env);
> +
> + ccc->parent_realize(dev, errp);
> +}
> +
> static void cris_cpu_initfn(Object *obj)
> {
> CRISCPU *cpu = CRIS_CPU(obj);
> @@ -65,9 +76,13 @@ static void cris_cpu_initfn(Object *obj)
>
> static void cris_cpu_class_init(ObjectClass *oc, void *data)
> {
> + DeviceClass *dc = DEVICE_CLASS(oc);
> CPUClass *cc = CPU_CLASS(oc);
> CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
>
> + ccc->parent_realize = dc->realize;
> + dc->realize = cris_cpu_realizefn;
> +
> ccc->parent_reset = cc->reset;
> cc->reset = cris_cpu_reset;
> }
> diff --git a/target-cris/translate.c b/target-cris/translate.c
> index 09e6011..25ff490 100644
> --- a/target-cris/translate.c
> +++ b/target-cris/translate.c
> @@ -3558,8 +3558,7 @@ CRISCPU *cpu_cris_init(const char *cpu_model)
>
> env->pregs[PR_VR] = vr_by_name(cpu_model);
>
> - cpu_reset(CPU(cpu));
> - qemu_init_vcpu(env);
> + object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
>
> if (tcg_initialized) {
> return cpu;
> --
> 1.7.10.4
>
>
--
Eduardo
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [RFC qom-cpu v2 07/28] target-cris: Introduce QOM realizefn for CRISCPU,
Eduardo Habkost <=