On Tue, Sep 12, 2017 at 08:51:21AM +0200, Greg Kurz wrote: > 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: Greg Kurz <gr...@kaod.org>
Applied to ppc-for-2.11. > --- > v3: - dropped spapr_cpu_reset() hunk > --- > hw/ppc/spapr_cpu_core.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > index dc9df0d393d1..dea298a796c4 100644 > --- a/hw/ppc/spapr_cpu_core.c > +++ b/hw/ppc/spapr_cpu_core.c > @@ -162,10 +162,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; > @@ -254,7 +254,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; > } > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature