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: David Hildenbrand <david@redhat.com> Reviewed-by: Greg Kurz <groug@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
81985f3be9
commit
4e8a01bdb2
|
@ -3184,12 +3184,18 @@ out:
|
||||||
static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
|
const sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(hotplug_dev);
|
||||||
PCDIMMDevice *dimm = PC_DIMM(dev);
|
PCDIMMDevice *dimm = PC_DIMM(dev);
|
||||||
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
|
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
|
||||||
MemoryRegion *mr;
|
MemoryRegion *mr;
|
||||||
uint64_t size;
|
uint64_t size;
|
||||||
char *mem_dev;
|
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);
|
mr = ddc->get_memory_region(dimm, errp);
|
||||||
if (!mr) {
|
if (!mr) {
|
||||||
return;
|
return;
|
||||||
|
@ -3571,14 +3577,7 @@ out:
|
||||||
static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,
|
static void spapr_machine_device_plug(HotplugHandler *hotplug_dev,
|
||||||
DeviceState *dev, Error **errp)
|
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 (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);
|
spapr_memory_plug(hotplug_dev, dev, errp);
|
||||||
} else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) {
|
||||||
spapr_core_plug(hotplug_dev, dev, errp);
|
spapr_core_plug(hotplug_dev, dev, errp);
|
||||||
|
|
Loading…
Reference in New Issue