On Thu, Oct 05, 2017 at 06:24:35PM +0200, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Acked-by: David Gibson <da...@gibson.dropbear.id.au> > --- > hw/ppc/ppc405_uc.c | 6 ++++-- > hw/ppc/ppc4xx_devs.c | 4 ++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c > index 8e58065..205ebce 100644 > --- a/hw/ppc/ppc405_uc.c > +++ b/hw/ppc/ppc405_uc.c > @@ -1629,7 +1629,8 @@ CPUPPCState *ppc405cr_init(MemoryRegion > *address_space_mem, > qemu_irq *pic, *irqs; > > memset(clk_setup, 0, sizeof(clk_setup)); > - cpu = ppc4xx_init("405cr", &clk_setup[PPC405CR_CPU_CLK], > + cpu = ppc4xx_init(POWERPC_CPU_TYPE_NAME("405crc"), > + &clk_setup[PPC405CR_CPU_CLK], > &clk_setup[PPC405CR_TMR_CLK], sysclk); > env = &cpu->env; > /* Memory mapped devices registers */ > @@ -1981,7 +1982,8 @@ CPUPPCState *ppc405ep_init(MemoryRegion > *address_space_mem, > > memset(clk_setup, 0, sizeof(clk_setup)); > /* init CPUs */ > - cpu = ppc4xx_init("405ep", &clk_setup[PPC405EP_CPU_CLK], > + cpu = ppc4xx_init(POWERPC_CPU_TYPE_NAME("405ep"), > + &clk_setup[PPC405EP_CPU_CLK], > &tlb_clk_setup, sysclk); > env = &cpu->env; > clk_setup[PPC405EP_CPU_CLK].cb = tlb_clk_setup.cb; > diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c > index 6d7f785..2e96389 100644 > --- a/hw/ppc/ppc4xx_devs.c > +++ b/hw/ppc/ppc4xx_devs.c > @@ -48,7 +48,7 @@ static void ppc4xx_reset(void *opaque) > > > /*****************************************************************************/ > /* Generic PowerPC 4xx processor instantiation */ > -PowerPCCPU *ppc4xx_init(const char *cpu_model, > +PowerPCCPU *ppc4xx_init(const char *cpu_type, > clk_setup_t *cpu_clk, clk_setup_t *tb_clk, > uint32_t sysclk) > { > @@ -56,7 +56,7 @@ PowerPCCPU *ppc4xx_init(const char *cpu_model, > CPUPPCState *env; > > /* init CPUs */ > - cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)); > + cpu = POWERPC_CPU(cpu_create(cpu_type)); > env = &cpu->env; > > cpu_clk->cb = NULL; /* We don't care about CPU clock frequency changes */ -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature