| Message ID | 20180327043741.7705-2-david@gibson.dropbear.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | target/ppc: Assorted cpu cleanups (esp. hash64 MMU) | expand |
On Tue, 27 Mar 2018 15:37:30 +1100 David Gibson <david@gibson.dropbear.id.au> wrote: > Because of the various hooks called some variant on "init" - and the rather > greater number that used to exist, I'm always wondering when a function > called simply "*_init" or "*_initfn" will be called. > > To make it easier on myself, and maybe others, rename the instance_init > hooks for ppc cpus to *_instance_init(). While we're at it rename the > realize time hooks to *_realize() (from *_realizefn()) which seems to be > the more common current convention. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > target/ppc/translate_init.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c > index 391b94b97d..56b80a204a 100644 > --- a/target/ppc/translate_init.c > +++ b/target/ppc/translate_init.c > @@ -9726,7 +9726,7 @@ static inline bool ppc_cpu_is_valid(PowerPCCPUClass *pcc) > #endif > } > > -static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) > +static void ppc_cpu_realize(DeviceState *dev, Error **errp) > { > CPUState *cs = CPU(dev); > PowerPCCPU *cpu = POWERPC_CPU(dev); > @@ -9952,7 +9952,7 @@ unrealize: > cpu_exec_unrealizefn(cs); > } > > -static void ppc_cpu_unrealizefn(DeviceState *dev, Error **errp) > +static void ppc_cpu_unrealize(DeviceState *dev, Error **errp) > { > PowerPCCPU *cpu = POWERPC_CPU(dev); > PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); > @@ -10438,7 +10438,7 @@ static bool ppc_cpu_is_big_endian(CPUState *cs) > } > #endif > > -static void ppc_cpu_initfn(Object *obj) > +static void ppc_cpu_instance_init(Object *obj) > { > CPUState *cs = CPU(obj); > PowerPCCPU *cpu = POWERPC_CPU(obj); > @@ -10561,9 +10561,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) > CPUClass *cc = CPU_CLASS(oc); > DeviceClass *dc = DEVICE_CLASS(oc); > > - device_class_set_parent_realize(dc, ppc_cpu_realizefn, > + device_class_set_parent_realize(dc, ppc_cpu_realize, > &pcc->parent_realize); > - device_class_set_parent_unrealize(dc, ppc_cpu_unrealizefn, > + device_class_set_parent_unrealize(dc, ppc_cpu_unrealize, > &pcc->parent_unrealize); > pcc->pvr_match = ppc_pvr_match_default; > pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_always; > @@ -10623,7 +10623,7 @@ static const TypeInfo ppc_cpu_type_info = { > .name = TYPE_POWERPC_CPU, > .parent = TYPE_CPU, > .instance_size = sizeof(PowerPCCPU), > - .instance_init = ppc_cpu_initfn, > + .instance_init = ppc_cpu_instance_init, > .abstract = true, > .class_size = sizeof(PowerPCCPUClass), > .class_init = ppc_cpu_class_init,
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 391b94b97d..56b80a204a 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -9726,7 +9726,7 @@ static inline bool ppc_cpu_is_valid(PowerPCCPUClass *pcc) #endif } -static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) +static void ppc_cpu_realize(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); PowerPCCPU *cpu = POWERPC_CPU(dev); @@ -9952,7 +9952,7 @@ unrealize: cpu_exec_unrealizefn(cs); } -static void ppc_cpu_unrealizefn(DeviceState *dev, Error **errp) +static void ppc_cpu_unrealize(DeviceState *dev, Error **errp) { PowerPCCPU *cpu = POWERPC_CPU(dev); PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); @@ -10438,7 +10438,7 @@ static bool ppc_cpu_is_big_endian(CPUState *cs) } #endif -static void ppc_cpu_initfn(Object *obj) +static void ppc_cpu_instance_init(Object *obj) { CPUState *cs = CPU(obj); PowerPCCPU *cpu = POWERPC_CPU(obj); @@ -10561,9 +10561,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) CPUClass *cc = CPU_CLASS(oc); DeviceClass *dc = DEVICE_CLASS(oc); - device_class_set_parent_realize(dc, ppc_cpu_realizefn, + device_class_set_parent_realize(dc, ppc_cpu_realize, &pcc->parent_realize); - device_class_set_parent_unrealize(dc, ppc_cpu_unrealizefn, + device_class_set_parent_unrealize(dc, ppc_cpu_unrealize, &pcc->parent_unrealize); pcc->pvr_match = ppc_pvr_match_default; pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_always; @@ -10623,7 +10623,7 @@ static const TypeInfo ppc_cpu_type_info = { .name = TYPE_POWERPC_CPU, .parent = TYPE_CPU, .instance_size = sizeof(PowerPCCPU), - .instance_init = ppc_cpu_initfn, + .instance_init = ppc_cpu_instance_init, .abstract = true, .class_size = sizeof(PowerPCCPUClass), .class_init = ppc_cpu_class_init,
Because of the various hooks called some variant on "init" - and the rather greater number that used to exist, I'm always wondering when a function called simply "*_init" or "*_initfn" will be called. To make it easier on myself, and maybe others, rename the instance_init hooks for ppc cpus to *_instance_init(). While we're at it rename the realize time hooks to *_realize() (from *_realizefn()) which seems to be the more common current convention. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- target/ppc/translate_init.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)