Re: [Qemu-devel] [PATCH 18/28] xtensa: replace cpu_xtensa_init() with cpu_generic_init()

[Igor Mammedov]

On Wed, 16 Aug 2017 16:56:40 -0300
Eduardo Habkost <address@hidden> wrote:

> On Fri, Jul 14, 2017 at 03:52:09PM +0200, Igor Mammedov wrote:
> > call xtensa_irq_init() at realize time which makes
> > cpu_xtensa_init() like generic cpu creation function.
> > As result we can replace it with cpu_generic_init()
> > which does the same job, reducing code duplication a bit.
> > 
> > Signed-off-by: Igor Mammedov <address@hidden>  
> 
> Looks good to me.  Were you able to test it?
images are from 
http://jcmvbkbc.spb.ru/~dumb/ws/osll/qemu-xtensa/20110829/xtensa-dc232b_kernel_rootfs.tgz
http://jcmvbkbc.spb.ru/~dumb/tmp/201508231001/default-sim-fsf/Image.elf

instructions to test is from
http://qemu-buch.de/de/index.php?title=QEMU-KVM-Buch/_Gast-Systeme/_Xtensa-Architektur

it boots till some point, so CPU is still there
which should be sufficient for this patch

> 
> > ---
> > CC: Max Filippov <address@hidden>
> > ---
> >  target/xtensa/cpu.h    |  4 +---
> >  hw/xtensa/sim.c        |  2 +-
> >  hw/xtensa/xtfpga.c     |  2 +-
> >  target/xtensa/cpu.c    |  3 +++
> >  target/xtensa/helper.c | 22 ----------------------
> >  5 files changed, 6 insertions(+), 27 deletions(-)
> > 
> > diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
> > index ee29fb1..4803331 100644
> > --- a/target/xtensa/cpu.h
> > +++ b/target/xtensa/cpu.h
> > @@ -475,9 +475,7 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, 
> > vaddr addr,
> >  #define XTENSA_DEFAULT_CPU_MODEL "dc232b"
> >  #endif
> >  
> > -XtensaCPU *cpu_xtensa_init(const char *cpu_model);
> > -
> > -#define cpu_init(cpu_model) CPU(cpu_xtensa_init(cpu_model))
> > +#define cpu_init(cpu_model) cpu_generic_init(TYPE_XTENSA_CPU, cpu_model)
> >  
> >  void xtensa_translate_init(void);
> >  void xtensa_breakpoint_handler(CPUState *cs);
> > diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
> > index 5521e91..bf1f729 100644
> > --- a/hw/xtensa/sim.c
> > +++ b/hw/xtensa/sim.c
> > @@ -86,7 +86,7 @@ static void xtensa_sim_init(MachineState *machine)
> >      }
> >  
> >      for (n = 0; n < smp_cpus; n++) {
> > -        cpu = cpu_xtensa_init(cpu_model);
> > +        cpu = XTENSA_CPU(cpu_generic_init(TYPE_XTENSA_CPU, cpu_model));
> >          if (cpu == NULL) {
> >              error_report("unable to find CPU definition '%s'",
> >                           cpu_model);
> > diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
> > index d5ac080..b656660 100644
> > --- a/hw/xtensa/xtfpga.c
> > +++ b/hw/xtensa/xtfpga.c
> > @@ -232,7 +232,7 @@ static void lx_init(const LxBoardDesc *board, 
> > MachineState *machine)
> >      }
> >  
> >      for (n = 0; n < smp_cpus; n++) {
> > -        cpu = cpu_xtensa_init(cpu_model);
> > +        cpu = XTENSA_CPU(cpu_generic_init(TYPE_XTENSA_CPU, cpu_model));
> >          if (cpu == NULL) {
> >              error_report("unable to find CPU definition '%s'",
> >                           cpu_model);
> > diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
> > index cd7f958..85897df 100644
> > --- a/target/xtensa/cpu.c
> > +++ b/target/xtensa/cpu.c
> > @@ -100,9 +100,12 @@ static ObjectClass *xtensa_cpu_class_by_name(const 
> > char *cpu_model)
> >  static void xtensa_cpu_realizefn(DeviceState *dev, Error **errp)
> >  {
> >      CPUState *cs = CPU(dev);
> > +    XtensaCPU *cpu = XTENSA_CPU(dev);
> >      XtensaCPUClass *xcc = XTENSA_CPU_GET_CLASS(dev);
> >      Error *local_err = NULL;
> >  
> > +    xtensa_irq_init(&cpu->env);
> > +
> >      cpu_exec_realizefn(cs, &local_err);
> >      if (local_err != NULL) {
> >          error_propagate(errp, local_err);
> > diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c
> > index bcd0b77..e8fba20 100644
> > --- a/target/xtensa/helper.c
> > +++ b/target/xtensa/helper.c
> > @@ -113,28 +113,6 @@ void xtensa_breakpoint_handler(CPUState *cs)
> >      }
> >  }
> >  
> > -XtensaCPU *cpu_xtensa_init(const char *cpu_model)
> > -{
> > -    ObjectClass *oc;
> > -    XtensaCPU *cpu;
> > -    CPUXtensaState *env;
> > -
> > -    oc = cpu_class_by_name(TYPE_XTENSA_CPU, cpu_model);
> > -    if (oc == NULL) {
> > -        return NULL;
> > -    }
> > -
> > -    cpu = XTENSA_CPU(object_new(object_class_get_name(oc)));
> > -    env = &cpu->env;
> > -
> > -    xtensa_irq_init(env);
> > -
> > -    object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
> > -
> > -    return cpu;
> > -}
> > -
> > -
> >  void xtensa_cpu_list(FILE *f, fprintf_function cpu_fprintf)
> >  {
> >      XtensaConfigList *core = xtensa_cores;
> > -- 
> > 2.7.4
> > 
> >   
>