From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGeDy-0000d8-F3 for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGeDu-0000Z9-Ct for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:50 -0500 Received: from ozlabs.org ([103.22.144.67]:32875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGeDu-0000YT-1D for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:46 -0500 Date: Thu, 29 Jan 2015 12:39:58 +1100 From: David Gibson Message-ID: <20150129013958.GS14681@voom> References: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> <1420697420-16053-10-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="EmW68jKGQIhj8inv" Content-Disposition: inline In-Reply-To: <1420697420-16053-10-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [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: Bharata B Rao Cc: imammedo@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com --EmW68jKGQIhj8inv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 08, 2015 at 11:40:16AM +0530, Bharata B Rao wrote: > Support hot removal of CPU for sPAPR guests. >=20 > Signed-off-by: Bharata B Rao > --- > hw/ppc/spapr.c | 43 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 43 insertions(+) >=20 > 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); > } > =20 > +static void spapr_cpu_release(DeviceState *dev, void *opaque) > +{ > + /* Release vCPU */ Um.. should this actually do something? > +} > + > +static void spapr_cpu_hotplug_remove(DeviceState *dev, CPUState *cs) > +{ > + PowerPCCPU *cpu =3D POWERPC_CPU(cs); > + int id =3D ppc_get_vcpu_dt_id(cpu); > + sPAPRDRConnector *drc =3D > + spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, id); > + sPAPRDRConnectorClass *drck =3D 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; > } > =20 > +static void spapr_cpu_unplug(HotplugHandler *hotplug_dev, DeviceState *d= ev, > + Error **errp) > +{ > + Error *local_err =3D NULL; Unused variable. > + CPUState *cs =3D CPU(dev); > + PowerPCCPU *cpu =3D POWERPC_CPU(cs); > + sPAPRDRConnector *drc =3D > + spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, cpu->cpu_d= t_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(HotplugHandl= er *hotplug_dev, > } > } > =20 > +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 *o= c, void *data) > mc->get_hotplug_handler =3D spapr_get_hotpug_handler; > =20 > hc->plug =3D spapr_machine_device_plug; > + hc->unplug =3D spapr_machine_device_unplug; > + > smc->dr_phb_enabled =3D false; > smc->dr_cpu_enabled =3D false; > smc->dr_lmb_enabled =3D false; --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --EmW68jKGQIhj8inv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUyY9uAAoJEGw4ysog2bOSYHsP/R+p1Av1WYgJvAgj1IYsK8uL pRsRP6o/4B2AVwk3aMA5738qH7Wwj1OefpVPPQmuSEmJQjgAMm7blgMEPyEfCYHA EiZdZpB+dG6CSIBR7xJtPQcnHRecrgjANArTvWQ4EBSj00xuUCcV9jjU8w3Ed0nD d22fQAW58q24GVqAqF824tdPjC/6DKo84/mBu6fnKYy9ijlMiTbxY/Ipyy5xH2EM RAJtG+pbQZtLhGfqvYgZxTuykmhjw6CT/VsZWE1R+PqnqVdyrPP+yDgtfIyCpL/B q4smEbTXUre0jdS0qd4RI4Fl7xJFI3lQZwfXY+FuV+k+eufkHJv2MOONRI+mb3gi 3lj+xMcaJZUtSYzHNCm/zaL85RnXT8q2X7p+zu8xqJY+WBiIoD0uCC9EPsBlQrls my9YQ13Ipa+gzwF6/hMv9GuOlPfvH3ROTerDXsw6SYCegzt8VV16RnqKPkB6DZRV lVA6HUbcHwKoYrA1gsZSH0phZoUS9zlpwd5ddE3QRbszegI0Xy/Zhkup+Tk/jOsq lqjrJifosQ6PD0WGrV6vmumxJj9D6SVEVMWIqE4z7XaCiZIf5UoU613eWInOWLEF Cwf+eCjC8CJLYxIZcMctEkFXL8IUpiehzHyVO7znsIyIZvPMDf063BzpYfilrAl3 idJ6EUmRtvmR/LPnV51/ =UrYK -----END PGP SIGNATURE----- --EmW68jKGQIhj8inv--