On Wed, Jan 17, 2018 at 10:20:27AM +0100, Greg Kurz wrote: > A variable is already defined at the begining of the function to > hold a pointer to the CPU core object: > > sPAPRCPUCore *core = SPAPR_CPU_CORE(OBJECT(dev)); > > No need to define it again in the pre-2.10 compatibility code snipplet. > > Signed-off-by: Greg Kurz <gr...@kaod.org>
Applied to ppc-for-2.12, thanks.
> ---
> hw/ppc/spapr.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 499ab647d882..bca838fce638 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -3362,9 +3362,7 @@ static void spapr_core_plug(HotplugHandler
> *hotplug_dev, DeviceState *dev,
> int i;
>
> for (i = 0; i < cc->nr_threads; i++) {
> - sPAPRCPUCore *sc = SPAPR_CPU_CORE(dev);
> -
> - cs = CPU(sc->threads[i]);
> + cs = CPU(core->threads[i]);
> pre_2_10_vmstate_unregister_dummy_icp(cs->cpu_index);
> }
> }
>
--
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
