[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 08/23] ppc: replace cpu_model with cpu_type on ref
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 08/23] ppc: replace cpu_model with cpu_type on ref405ep, taihu boards |
Date: |
Fri, 6 Oct 2017 14:12:49 +1100 |
User-agent: |
Mutt/1.9.0 (2017-09-02) |
On Thu, Oct 05, 2017 at 06:24:35PM +0200, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <address@hidden>
Acked-by: David Gibson <address@hidden>
> ---
> 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
- Re: [Qemu-ppc] [PATCH 04/23] ppc: mpc8544ds/e500plat: use generic cpu_model parsing, (continued)
- [Qemu-ppc] [PATCH 05/23] ppc: mac_newworld: use generic cpu_model parsing, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 09/23] ppc: virtex-ml507: replace cpu_model with cpu_type, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 06/23] ppc: mac_oldworld: use generic cpu_model parsing, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 07/23] ppc: bamboo: use generic cpu_model parsing, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 08/23] ppc: replace cpu_model with cpu_type on ref405ep, taihu boards, Igor Mammedov, 2017/10/05
- Re: [Qemu-ppc] [PATCH 08/23] ppc: replace cpu_model with cpu_type on ref405ep, taihu boards,
David Gibson <=
- [Qemu-ppc] [PATCH 11/23] ppc: spapr: replace ppc_cpu_parse_features() with cpu_parse_cpu_model(), Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 14/23] ppc: spapr: use cpu type name directly, Igor Mammedov, 2017/10/05
- [Qemu-ppc] [PATCH 15/23] ppc: spapr: register 'host' core type along with the rest of core types, Igor Mammedov, 2017/10/05