From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQy9R-0002xu-JS for qemu-devel@nongnu.org; Thu, 07 Jun 2018 12:52:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQy9Q-000236-QL for qemu-devel@nongnu.org; Thu, 07 Jun 2018 12:52:41 -0400 From: David Hildenbrand Date: Thu, 7 Jun 2018 18:52:17 +0200 Message-Id: <20180607165218.9558-8-david@redhat.com> In-Reply-To: <20180607165218.9558-1-david@redhat.com> References: <20180607165218.9558-1-david@redhat.com> Subject: [Qemu-devel] [PATCH v1 7/8] spapr: handle cpu core unplug via hotplug handler chain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Paolo Bonzini , Peter Crosthwaite , Richard Henderson , "Michael S . Tsirkin" , Igor Mammedov , david@redhat.com, Eduardo Habkost , David Gibson , Alexander Graf , Cornelia Huck , Christian Borntraeger , Greg Kurz Let's handle it via hotplug_handler_unplug() to make plug/unplug code look symmetrical. Acked-by: Igor Mammedov Signed-off-by: David Hildenbrand --- hw/ppc/spapr.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0a8a3455d6..994deea8cf 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3415,7 +3415,15 @@ static void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, /* Callback to be called during DRC release. */ void spapr_core_release(DeviceState *dev) { - MachineState *ms = MACHINE(qdev_get_hotplug_handler(dev)); + HotplugHandler *hotplug_ctrl = qdev_get_hotplug_handler(dev); + + /* Call the unplug handler chain. This can never fail. */ + hotplug_handler_unplug(hotplug_ctrl, dev, &error_abort); +} + +static void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev) +{ + MachineState *ms = MACHINE(hotplug_dev); sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(ms); CPUCore *cc = CPU_CORE(dev); CPUArchId *core_slot = spapr_find_cpu_slot(ms, cc->core_id, NULL); @@ -3600,6 +3608,8 @@ static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { spapr_memory_unplug(hotplug_dev, dev); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { + spapr_core_unplug(hotplug_dev, dev); } } -- 2.17.0