From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzQrD-0005Jr-Ek for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:10:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzQr7-0006B8-Ig for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:10:43 -0500 Received: from e32.co.us.ibm.com ([32.97.110.150]:44195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzQr6-0006Af-Vo for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:10:37 -0500 Received: from localhost by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 19 Nov 2015 08:10:36 -0700 Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 9F04219D8040 for ; Thu, 19 Nov 2015 07:58:30 -0700 (MST) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tAJF8rjK66584746 for ; Thu, 19 Nov 2015 08:08:53 -0700 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tAJFAL09017289 for ; Thu, 19 Nov 2015 08:10:22 -0700 From: Matthew Rosato Date: Thu, 19 Nov 2015 10:10:13 -0500 Message-Id: <1447945814-15765-9-git-send-email-mjrosato@linux.vnet.ibm.com> In-Reply-To: <1447945814-15765-1-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1447945814-15765-1-git-send-email-mjrosato@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 8/9] s390/virtio-ccw: Add hotplug handler and prepare for unplug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Prepare for hotplug and unplug of s390-cpu. In the case of unplug, s390 does not have a safe way of communicating the loss of CPU to a guest, so a full system reset will be performed on the guest. Signed-off-by: Matthew Rosato --- hw/s390x/s390-virtio-ccw.c | 28 ++++++++++++++++++++++++++++ target-s390x/cpu.c | 32 +++++++++++++++++++++++++++++++- target-s390x/cpu.h | 2 ++ 3 files changed, 61 insertions(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 4f6ed57..ba0a90d 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -155,10 +155,34 @@ static void ccw_init(MachineState *machine) gtod_save, gtod_load, kvm_state); } +static void s390_machine_device_plug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + +} + +static void s390_machine_device_unplug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { + s390_cpu_unplug(hotplug_dev, dev, errp); + } +} + +static HotplugHandler *s390_get_hotplug_handler(MachineState *machine, + DeviceState *dev) +{ + if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { + return HOTPLUG_HANDLER(machine); + } + return NULL; +} + static void ccw_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); NMIClass *nc = NMI_CLASS(oc); + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); mc->init = ccw_init; mc->reset = s390_machine_reset; @@ -170,6 +194,9 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->no_sdcard = 1; mc->use_sclp = 1; mc->max_cpus = 255; + mc->get_hotplug_handler = s390_get_hotplug_handler; + hc->plug = s390_machine_device_plug; + hc->unplug = s390_machine_device_unplug; nc->nmi_monitor_handler = s390_nmi; } @@ -231,6 +258,7 @@ static const TypeInfo ccw_machine_info = { .class_init = ccw_machine_class_init, .interfaces = (InterfaceInfo[]) { { TYPE_NMI }, + { TYPE_HOTPLUG_HANDLER}, { } }, }; diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 060a3cc..4b83a09 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -236,7 +236,6 @@ static void s390_cpu_initfn(Object *obj) #if !defined(CONFIG_USER_ONLY) struct tm tm; #endif - cs->env_ptr = env; cs->halted = 1; cs->exception_index = EXCP_HLT; @@ -282,6 +281,37 @@ static void s390_cpu_finalize(Object *obj) } #if !defined(CONFIG_USER_ONLY) +static void s390_cpu_destroy(S390CPU *cpu) +{ + CPUS390XState *env = &cpu->env; + s390_unregister_cpustate(env->cpu_num); +} + +static void s390_cpu_release(DeviceState *dev, void *opaque) +{ + CPUState *cs = CPU(dev); + + s390_cpu_destroy(S390_CPU(cs)); + cpu_remove(cs); +} + +int s390_cpu_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, + Error **errp) +{ + S390CPU *cpu = S390_CPU(dev); + CPUS390XState *env = &cpu->env; + + if (next_cpu_id > env->cpu_num) { + next_cpu_id = env->cpu_num; + } + s390_cpu_release(dev, NULL); + + /* Perform a full system reset */ + qemu_system_reset_request(); + + return 0; +} + static bool disabled_wait(CPUState *cpu) { return cpu->halted && !(S390_CPU(cpu)->env.psw.mask & diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 524a7e4..81554b5 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -543,6 +543,8 @@ static inline uint8_t s390_cpu_get_state(S390CPU *cpu) void gtod_save(QEMUFile *f, void *opaque); int gtod_load(QEMUFile *f, void *opaque, int version_id); +int s390_cpu_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, + Error **errp); /* service interrupts are floating therefore we must not pass an cpustate */ void s390_sclp_extint(uint32_t parm); -- 1.9.1