Implement cpu hotplug routine and add the machine hook. Signed-off-by: Matthew Rosato <mjros...@linux.vnet.ibm.com> --- hw/s390x/s390-virtio-ccw.c | 13 +++++++++++++ target-s390x/cpu.c | 7 +++++++ 2 files changed, 20 insertions(+)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4886dbf..cfb2ef4 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -215,6 +215,18 @@ static HotplugHandler *s390_get_hotplug_handler(MachineState *machine, return NULL; } +static void s390_hot_add_cpu(const int64_t id, Error **errp) +{ + MachineState *machine = MACHINE(qdev_get_machine()); + Error *local_err = NULL; + + s390_new_cpu(machine, id, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } +} + static void ccw_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -223,6 +235,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->init = ccw_init; mc->reset = s390_machine_reset; + mc->hot_add_cpu = s390_hot_add_cpu; mc->block_default_type = IF_VIRTIO; mc->no_cdrom = 1; mc->no_floppy = 1; diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index ec66ed6..6585f04 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -33,6 +33,7 @@ #include "qapi/visitor.h" #ifndef CONFIG_USER_ONLY #include "sysemu/arch_init.h" +#include "hw/s390x/sclp.h" #endif #define CR0_RESET 0xE0UL @@ -227,6 +228,12 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) #endif scc->parent_realize(dev, errp); + +#if !defined(CONFIG_USER_ONLY) + if (dev->hotplugged) { + raise_irq_cpu_hotplug(); + } +#endif } static void s390_cpu_get_id(Object *obj, Visitor *v, const char *name, -- 1.9.1