Commit 3b2fcedd authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

spapr_cpu_core: cleaning up qdev_get_machine() calls 



This patch removes the qdev_get_machine() calls that are made
in spapr_cpu_core.c in situations where we can get an existing
pointer for the MachineState by either passing it as an argument
to the function or by using other already available pointers.

Credits to Daniel Henrique Barboza for the idea and the changelog
text.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 96dbc9af

hw/ppc/spapr_cpu_core.c

+3 −3
Original line number Diff line number Diff line
@@ -174,10 +174,10 @@ static void spapr_cpu_core_unrealizefn(DeviceState *dev, Error **errp) 
    g_free(sc->threads);

}



static void spapr_cpu_core_realize_child(Object *child, Error **errp)

static void spapr_cpu_core_realize_child(Object *child,

                                         sPAPRMachineState *spapr, Error **errp)

{

    Error *local_err = NULL;

    sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());

    CPUState *cs = CPU(child);

    PowerPCCPU *cpu = POWERPC_CPU(cs);

    Object *obj;
@@ -266,7 +266,7 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) 
    for (j = 0; j < cc->nr_threads; j++) {

        obj = sc->threads + j * size;



        spapr_cpu_core_realize_child(obj, &local_err);

        spapr_cpu_core_realize_child(obj, spapr, &local_err);

        if (local_err) {

            goto err;

        }