david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ppc: replace cpu_ppc_init() with cpu_generic_init()

Browse Source 
it's just a wrapper, drop it and use cpu_generic_init() directly

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-26-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-08-24 18:31:48 +02:00 committed by Eduardo Habkost
parent 13b884e1d7
commit 84efa64c60
9 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/ppc/e500.c
View File

@ -819,7 +819,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
CPUState *cs; CPUState *cs;
qemu_irq *input; 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) { if (cpu == NULL) {
fprintf(stderr, "Unable to initialize CPU!\n"); fprintf(stderr, "Unable to initialize CPU!\n");
exit(1); exit(1);

3
hw/ppc/mac_newworld.c
View File

@ -187,7 +187,8 @@ static void ppc_core99_init(MachineState *machine)
#endif #endif
} }
for (i = 0; i < smp_cpus; i++) { 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) { if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n"); fprintf(stderr, "Unable to find PowerPC CPU definition\n");
exit(1); exit(1);

3
hw/ppc/mac_oldworld.c
View File

@ -116,7 +116,8 @@ static void ppc_heathrow_init(MachineState *machine)
if (machine->cpu_model == NULL) if (machine->cpu_model == NULL)
machine->cpu_model = "G3"; machine->cpu_model = "G3";
for (i = 0; i < smp_cpus; i++) { 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) { if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n"); fprintf(stderr, "Unable to find PowerPC CPU definition\n");
exit(1); exit(1);

2
hw/ppc/ppc440_bamboo.c
View File

@ -186,7 +186,7 @@ static void bamboo_init(MachineState *machine)
if (machine->cpu_model == NULL) { if (machine->cpu_model == NULL) {
machine->cpu_model = "440EP"; 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) { if (cpu == NULL) {
fprintf(stderr, "Unable to initialize CPU!\n"); fprintf(stderr, "Unable to initialize CPU!\n");
exit(1); exit(1);

2
hw/ppc/ppc4xx_devs.c
View File

@ -56,7 +56,7 @@ PowerPCCPU *ppc4xx_init(const char *cpu_model,
CPUPPCState *env; CPUPPCState *env;
/* init CPUs */ /* init CPUs */
cpu = cpu_ppc_init(cpu_model); cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model));
if (cpu == NULL) { if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC %s CPU definition\n", fprintf(stderr, "Unable to find PowerPC %s CPU definition\n",
cpu_model); cpu_model);

5
hw/ppc/prep.c
View File

@ -520,7 +520,8 @@ static void ppc_prep_init(MachineState *machine)
if (machine->cpu_model == NULL) if (machine->cpu_model == NULL)
machine->cpu_model = "602"; machine->cpu_model = "602";
for (i = 0; i < smp_cpus; i++) { 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) { if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n"); fprintf(stderr, "Unable to find PowerPC CPU definition\n");
exit(1); exit(1);
@ -724,7 +725,7 @@ static void ibm_40p_init(MachineState *machine)
if (!machine->cpu_model) { if (!machine->cpu_model) {
machine->cpu_model = "604"; 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) { if (!cpu) {
error_report("could not initialize CPU '%s'", error_report("could not initialize CPU '%s'",
machine->cpu_model); machine->cpu_model);

2
hw/ppc/virtex_ml507.c
View File

@ -96,7 +96,7 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size,
CPUPPCState *env; CPUPPCState *env;
qemu_irq *irqs; qemu_irq *irqs;
cpu = cpu_ppc_init(cpu_model); cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model));
if (cpu == NULL) { if (cpu == NULL) {
fprintf(stderr, "Unable to initialize CPU!\n"); fprintf(stderr, "Unable to initialize CPU!\n");
exit(1); exit(1);

3
target/ppc/cpu.h
View File

@ -1276,7 +1276,6 @@ extern const struct VMStateDescription vmstate_ppc_cpu;
#endif #endif
/*****************************************************************************/ /*****************************************************************************/
PowerPCCPU *cpu_ppc_init(const char *cpu_model);
void ppc_translate_init(void); void ppc_translate_init(void);
const char *ppc_cpu_lookup_alias(const char *alias); const char *ppc_cpu_lookup_alias(const char *alias);
/* you can call this signal handler from your SIGBUS and SIGSEGV /* 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_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); 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_signal_handler cpu_ppc_signal_handler
#define cpu_list ppc_cpu_list #define cpu_list ppc_cpu_list

5
target/ppc/translate_init.c
View File

@ -10271,11 +10271,6 @@ const char *ppc_cpu_lookup_alias(const char *alias)
return NULL; 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) PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc)
{ {
ObjectClass *oc = OBJECT_CLASS(pcc); ObjectClass *oc = OBJECT_CLASS(pcc);