[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [RFC for-2.12 1/8] spapr: Rename machine init functions f
From: |
Greg Kurz |
Subject: |
Re: [Qemu-ppc] [RFC for-2.12 1/8] spapr: Rename machine init functions for clarity |
Date: |
Mon, 11 Dec 2017 09:42:53 +0100 |
On Mon, 11 Dec 2017 18:08:01 +1100
David Gibson <address@hidden> wrote:
> Machine objects have two init functions - the generic QOM level
> instance_init which should only do static object initialization, and
> the Machine specific MachineClass::init which does the actual
> construction of the machine.
>
> In spapr the functions implementing these two have names -
> ppc_machine_initfn() and ppc_spapr_init() - which don't correspond closely
> to either of those. To prevent people (read, me) from confusing which is
> which, rename them spapr_instance_init() and spapr_machine_init() to
> make it clearer which is which.
>
> While we're there rename ppc_spapr_reset() to spapr_machine_reset() to
> match.
>
> Signed-off-by: David Gibson <address@hidden>
> ---
Reviewed-by: Greg Kurz <address@hidden>
> hw/ppc/spapr.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 306875e123..42d6a2302a 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1454,7 +1454,7 @@ static int spapr_reset_drcs(Object *child, void *opaque)
> return 0;
> }
>
> -static void ppc_spapr_reset(void)
> +static void spapr_machine_reset(void)
> {
> MachineState *machine = MACHINE(qdev_get_machine());
> sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
> @@ -2292,7 +2292,7 @@ out:
> }
>
> /* pSeries LPAR / sPAPR hardware init */
> -static void ppc_spapr_init(MachineState *machine)
> +static void spapr_machine_init(MachineState *machine)
> {
> sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
> sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine);
> @@ -2820,7 +2820,7 @@ static void spapr_set_vsmt(Object *obj, Visitor *v,
> const char *name,
> visit_type_uint32(v, name, (uint32_t *)opaque, errp);
> }
>
> -static void spapr_machine_initfn(Object *obj)
> +static void spapr_instance_init(Object *obj)
> {
> sPAPRMachineState *spapr = SPAPR_MACHINE(obj);
>
> @@ -3777,8 +3777,8 @@ static void spapr_machine_class_init(ObjectClass *oc,
> void *data)
> * functions for the specific versioned machine types can override
> * these details for backwards compatibility
> */
> - mc->init = ppc_spapr_init;
> - mc->reset = ppc_spapr_reset;
> + mc->init = spapr_machine_init;
> + mc->reset = spapr_machine_reset;
> mc->block_default_type = IF_SCSI;
> mc->max_cpus = 1024;
> mc->no_parallel = 1;
> @@ -3825,7 +3825,7 @@ static const TypeInfo spapr_machine_info = {
> .parent = TYPE_MACHINE,
> .abstract = true,
> .instance_size = sizeof(sPAPRMachineState),
> - .instance_init = spapr_machine_initfn,
> + .instance_init = spapr_instance_init,
> .instance_finalize = spapr_machine_finalizefn,
> .class_size = sizeof(sPAPRMachineClass),
> .class_init = spapr_machine_class_init,
- Re: [Qemu-ppc] [RFC for-2.12 2/8] spapr: Capabilities infrastructure, (continued)
[Qemu-ppc] [RFC for-2.12 1/8] spapr: Rename machine init functions for clarity, David Gibson, 2017/12/11
[Qemu-ppc] [RFC for-2.12 5/8] spapr: Assume msi_nonbroken, David Gibson, 2017/12/11
[Qemu-ppc] [RFC for-2.12 7/8] spapr: Handle VMX/VSX presence as an spapr capability flag, David Gibson, 2017/12/11