Commit 5279569e authored by Gu Zheng's avatar Gu Zheng Committed by Michael S. Tsirkin
Browse files

pc: add cpu hotplug handler to PC_MACHINE 



Add cpu hotplug handler to PC_MACHINE, which will perform the acpi
cpu hotplug callback via hotplug_handler API.

Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
parent 08bba95b

hw/i386/pc.c

+27 −1
Original line number Diff line number Diff line
@@ -1618,11 +1618,36 @@ out: 
    error_propagate(errp, local_err);

}



static void pc_cpu_plug(HotplugHandler *hotplug_dev,

                        DeviceState *dev, Error **errp)

{

    HotplugHandlerClass *hhc;

    Error *local_err = NULL;

    PCMachineState *pcms = PC_MACHINE(hotplug_dev);



    if (!dev->hotplugged) {

        goto out;

    }



    if (!pcms->acpi_dev) {

        error_setg(&local_err,

                   "cpu hotplug is not enabled: missing acpi device");

        goto out;

    }



    hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);

    hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);

out:

    error_propagate(errp, local_err);

}



static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,

                                      DeviceState *dev, Error **errp)

{

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

        pc_dimm_plug(hotplug_dev, dev, errp);

    } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {

        pc_cpu_plug(hotplug_dev, dev, errp);

    }

}
@@ -1631,7 +1656,8 @@ static HotplugHandler *pc_get_hotpug_handler(MachineState *machine, 
{

    PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine);



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

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

        object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {

        return HOTPLUG_HANDLER(machine);

    }