From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y96JG-0002AG-BQ for qemu-devel@nongnu.org; Thu, 08 Jan 2015 01:11:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y96JB-0006iq-Qt for qemu-devel@nongnu.org; Thu, 08 Jan 2015 01:11:06 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:41538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y96JB-0006iC-7c for qemu-devel@nongnu.org; Thu, 08 Jan 2015 01:11:01 -0500 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 11:40:59 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 53D7BE0023 for ; Thu, 8 Jan 2015 11:42:00 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay03.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t086AouY40435824 for ; Thu, 8 Jan 2015 11:40:51 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t086AfQJ032247 for ; Thu, 8 Jan 2015 11:40:42 +0530 From: Bharata B Rao Date: Thu, 8 Jan 2015 11:40:16 +0530 Message-Id: <1420697420-16053-10-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v1 09/13] spapr: CPU hot unplug support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de Support hot removal of CPU for sPAPR guests. Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4347471..ec793b1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1908,6 +1908,22 @@ static void spapr_cpu_hotplug_add(DeviceState *dev, CPUState *cs) drck->attach(drc, dev, fdt, offset, false); } +static void spapr_cpu_release(DeviceState *dev, void *opaque) +{ + /* Release vCPU */ +} + +static void spapr_cpu_hotplug_remove(DeviceState *dev, CPUState *cs) +{ + PowerPCCPU *cpu = POWERPC_CPU(cs); + int id = ppc_get_vcpu_dt_id(cpu); + sPAPRDRConnector *drc = + spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, id); + sPAPRDRConnectorClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); + + drck->detach(drc, dev, spapr_cpu_release, NULL); +} + static void spapr_cpu_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { @@ -1948,6 +1964,21 @@ static void spapr_cpu_plug(HotplugHandler *hotplug_dev, DeviceState *dev, return; } +static void spapr_cpu_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, + Error **errp) +{ + Error *local_err = NULL; + CPUState *cs = CPU(dev); + PowerPCCPU *cpu = POWERPC_CPU(cs); + sPAPRDRConnector *drc = + spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, cpu->cpu_dt_id); + + spapr_cpu_hotplug_remove(dev, cs); + spapr_hotplug_req_remove_event(drc); + error_propagate(errp, local_err); + return; +} + static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { @@ -1958,6 +1989,16 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, } } +static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { + if (dev->hotplugged) { + spapr_cpu_unplug(hotplug_dev, dev, errp); + } + } +} + static HotplugHandler *spapr_get_hotpug_handler(MachineState *machine, DeviceState *dev) { @@ -1986,6 +2027,8 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->get_hotplug_handler = spapr_get_hotpug_handler; hc->plug = spapr_machine_device_plug; + hc->unplug = spapr_machine_device_unplug; + smc->dr_phb_enabled = false; smc->dr_cpu_enabled = false; smc->dr_lmb_enabled = false; -- 2.1.0