Commit 4e8a01bd authored by David Hildenbrand's avatar David Hildenbrand Committed by David Gibson
Browse files

spapr: move memory hotplug support check into spapr_memory_pre_plug() 



Let's finish cleaning up the hotplug handler. This check can be
performed in the pre_plug code as the very first thing.

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 81985f3b

hw/ppc/spapr.c

+6 −7
Original line number Diff line number Diff line
@@ -3184,12 +3184,18 @@ out: 
static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,

                                  Error **errp)

{

    const sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(hotplug_dev);

    PCDIMMDevice *dimm = PC_DIMM(dev);

    PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);

    MemoryRegion *mr;

    uint64_t size;

    char *mem_dev;



    if (!smc->dr_lmb_enabled) {

        error_setg(errp, "Memory hotplug not supported for this machine");

        return;

    }



    mr = ddc->get_memory_region(dimm, errp);

    if (!mr) {

        return;
@@ -3571,14 +3577,7 @@ out: 
static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,

                                      DeviceState *dev, Error **errp)

{

    MachineState *ms = MACHINE(hotplug_dev);

    sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(ms);



    if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {

        if (!smc->dr_lmb_enabled) {

            error_setg(errp, "Memory hotplug not supported for this machine");

            return;

        }

        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);