On Fri, 8 Jun 2018 14:48:12 +0200 David Hildenbrand <da...@redhat.com> wrote:
> Let's clean the hotplug handler up by moving lookup of the node into > the function where it is actually being used. > > Signed-off-by: David Hildenbrand <da...@redhat.com> > --- Reviewed-by: Greg Kurz <gr...@kaod.org> > hw/ppc/spapr.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index f16a0b2870..1f577b274b 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3136,7 +3136,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t > addr_start, uint64_t size, > } > > static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > - uint32_t node, Error **errp) > + Error **errp) > { > Error *local_err = NULL; > sPAPRMachineState *ms = SPAPR_MACHINE(hotplug_dev); > @@ -3144,6 +3144,7 @@ static void spapr_memory_plug(HotplugHandler > *hotplug_dev, DeviceState *dev, > PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); > MemoryRegion *mr; > uint64_t align, size, addr; > + uint32_t node; > > mr = ddc->get_memory_region(dimm, &local_err); > if (local_err) { > @@ -3163,6 +3164,8 @@ static void spapr_memory_plug(HotplugHandler > *hotplug_dev, DeviceState *dev, > goto out_unplug; > } > > + node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP, > + &error_abort); > spapr_add_lmbs(dev, addr, size, node, > spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), > &local_err); > @@ -3572,16 +3575,11 @@ static void spapr_machine_device_plug(HotplugHandler > *hotplug_dev, > sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(ms); > > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > - int node; > - > if (!smc->dr_lmb_enabled) { > error_setg(errp, "Memory hotplug not supported for this > machine"); > return; > } > - node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP, > - &error_abort); > - > - spapr_memory_plug(hotplug_dev, dev, node, errp); > + spapr_memory_plug(hotplug_dev, dev, errp); > } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { > spapr_core_plug(hotplug_dev, dev, errp); > }