From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dWGH8-0002jY-2w for qemu-devel@nongnu.org; Sat, 15 Jul 2017 02:09:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dWGH4-0006e7-8g for qemu-devel@nongnu.org; Sat, 15 Jul 2017 02:09:58 -0400 References: <1500040339-119465-1-git-send-email-imammedo@redhat.com> <1500040339-119465-29-git-send-email-imammedo@redhat.com> From: =?UTF-8?Q?Herv=c3=a9_Poussineau?= Message-ID: <7e676758-18a5-62a1-b155-f02bcf226ed2@reactos.org> Date: Sat, 15 Jul 2017 08:09:42 +0200 MIME-Version: 1.0 In-Reply-To: <1500040339-119465-29-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 28/28] ppc: replace cpu_ppc_init() with cpu_generic_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: =?UTF-8?Q?Andreas_F=c3=a4rber?= , Eduardo Habkost , Peter Maydell , Alexander Graf , David Gibson , "Edgar E. Iglesias" , qemu-ppc@nongnu.org Le 14/07/2017 à 15:52, Igor Mammedov a écrit : > it's just a wrapper, drop it and use cpu_generic_init() directly > > Signed-off-by: Igor Mammedov Reviewed-by: Hervé Poussineau > --- > CC: Alexander Graf > CC: David Gibson > CC: "Hervé Poussineau" > CC: "Edgar E. Iglesias" > CC: qemu-ppc@nongnu.org > --- > target/ppc/cpu.h | 3 +-- > hw/ppc/e500.c | 3 ++- > hw/ppc/mac_newworld.c | 3 ++- > hw/ppc/mac_oldworld.c | 3 ++- > hw/ppc/ppc440_bamboo.c | 2 +- > hw/ppc/ppc4xx_devs.c | 2 +- > hw/ppc/prep.c | 5 +++-- > hw/ppc/virtex_ml507.c | 2 +- > target/ppc/translate_init.c | 5 ----- > 9 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 6ee2a26..696cbeb 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -1276,7 +1276,6 @@ extern const struct VMStateDescription vmstate_ppc_cpu; > #endif > > /*****************************************************************************/ > -PowerPCCPU *cpu_ppc_init(const char *cpu_model); > void ppc_translate_init(void); > const char *ppc_cpu_lookup_alias(const char *alias); > /* you can call this signal handler from your SIGBUS and SIGSEGV > @@ -1353,7 +1352,7 @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn) > int ppc_dcr_read (ppc_dcr_t *dcr_env, int dcrn, uint32_t *valp); > int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val); > > -#define cpu_init(cpu_model) CPU(cpu_ppc_init(cpu_model)) > +#define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model) > > #define cpu_signal_handler cpu_ppc_signal_handler > #define cpu_list ppc_cpu_list > diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c > index 62f1857..f0596f3 100644 > --- a/hw/ppc/e500.c > +++ b/hw/ppc/e500.c > @@ -819,7 +819,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) > CPUState *cs; > qemu_irq *input; > > - cpu = cpu_ppc_init(machine->cpu_model); > + cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, > + machine->cpu_model)); > if (cpu == NULL) { > fprintf(stderr, "Unable to initialize CPU!\n"); > exit(1); > diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c > index bae1c0a..72c98e9 100644 > --- a/hw/ppc/mac_newworld.c > +++ b/hw/ppc/mac_newworld.c > @@ -187,7 +187,8 @@ static void ppc_core99_init(MachineState *machine) > #endif > } > for (i = 0; i < smp_cpus; i++) { > - cpu = cpu_ppc_init(machine->cpu_model); > + cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, > + machine->cpu_model)); > if (cpu == NULL) { > fprintf(stderr, "Unable to find PowerPC CPU definition\n"); > exit(1); > diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c > index 97bb854..6fc2a19 100644 > --- a/hw/ppc/mac_oldworld.c > +++ b/hw/ppc/mac_oldworld.c > @@ -116,7 +116,8 @@ static void ppc_heathrow_init(MachineState *machine) > if (machine->cpu_model == NULL) > machine->cpu_model = "G3"; > for (i = 0; i < smp_cpus; i++) { > - cpu = cpu_ppc_init(machine->cpu_model); > + cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, > + machine->cpu_model)); > if (cpu == NULL) { > fprintf(stderr, "Unable to find PowerPC CPU definition\n"); > exit(1); > diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c > index 9d997bf..ca26398 100644 > --- a/hw/ppc/ppc440_bamboo.c > +++ b/hw/ppc/ppc440_bamboo.c > @@ -186,7 +186,7 @@ static void bamboo_init(MachineState *machine) > if (machine->cpu_model == NULL) { > machine->cpu_model = "440EP"; > } > - cpu = cpu_ppc_init(machine->cpu_model); > + cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, machine->cpu_model)); > if (cpu == NULL) { > fprintf(stderr, "Unable to initialize CPU!\n"); > exit(1); > diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c > index e7f413e..6b38ed7 100644 > --- a/hw/ppc/ppc4xx_devs.c > +++ b/hw/ppc/ppc4xx_devs.c > @@ -56,7 +56,7 @@ PowerPCCPU *ppc4xx_init(const char *cpu_model, > CPUPPCState *env; > > /* init CPUs */ > - cpu = cpu_ppc_init(cpu_model); > + cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)); > if (cpu == NULL) { > fprintf(stderr, "Unable to find PowerPC %s CPU definition\n", > cpu_model); > diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c > index 36d3dcd..00f3321 100644 > --- a/hw/ppc/prep.c > +++ b/hw/ppc/prep.c > @@ -520,7 +520,8 @@ static void ppc_prep_init(MachineState *machine) > if (machine->cpu_model == NULL) > machine->cpu_model = "602"; > for (i = 0; i < smp_cpus; i++) { > - cpu = cpu_ppc_init(machine->cpu_model); > + cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, > + machine->cpu_model)); > if (cpu == NULL) { > fprintf(stderr, "Unable to find PowerPC CPU definition\n"); > exit(1); > @@ -724,7 +725,7 @@ static void ibm_40p_init(MachineState *machine) > if (!machine->cpu_model) { > machine->cpu_model = "604"; > } > - cpu = cpu_ppc_init(machine->cpu_model); > + cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, machine->cpu_model)); > if (!cpu) { > error_report("could not initialize CPU '%s'", > machine->cpu_model); > diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c > index fdbcf22..d5fdc16 100644 > --- a/hw/ppc/virtex_ml507.c > +++ b/hw/ppc/virtex_ml507.c > @@ -96,7 +96,7 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size, > CPUPPCState *env; > qemu_irq *irqs; > > - cpu = cpu_ppc_init(cpu_model); > + cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)); > if (cpu == NULL) { > fprintf(stderr, "Unable to initialize CPU!\n"); > exit(1); > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c > index 783bf98..b4eaabb 100644 > --- a/target/ppc/translate_init.c > +++ b/target/ppc/translate_init.c > @@ -10250,11 +10250,6 @@ const char *ppc_cpu_lookup_alias(const char *alias) > return NULL; > } > > -PowerPCCPU *cpu_ppc_init(const char *cpu_model) > -{ > - return POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)); > -} > - > PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc) > { > ObjectClass *oc = OBJECT_CLASS(pcc); >