Commit 81985f3b authored by David Hildenbrand's avatar David Hildenbrand Committed by David Gibson
Browse files

spapr: move lookup of the node into spapr_memory_plug() 



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: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent fcc8ef17

hw/ppc/spapr.c

+5 −7
Original line number Diff line number Diff line
@@ -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);

    }