From nobody Thu Nov 6 20:31:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487745366313952.4383935778642; Tue, 21 Feb 2017 22:36:06 -0800 (PST) Received: from localhost ([::1]:50125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgQWy-0004SW-Nu for importer@patchew.org; Wed, 22 Feb 2017 01:36:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgQV0-0002wx-4m for qemu-devel@nongnu.org; Wed, 22 Feb 2017 01:34:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgQUw-0007og-V4 for qemu-devel@nongnu.org; Wed, 22 Feb 2017 01:34:02 -0500 Received: from ozlabs.org ([103.22.144.67]:35403) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgQUw-0007nG-IT; Wed, 22 Feb 2017 01:33:58 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vSndG4HgPz9s7k; Wed, 22 Feb 2017 17:33:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1487745234; bh=3MsvUKMYwxiY50Me+s4I9JP8Jq22tEt0WJ9CtaimjK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iK7xH/PmOoWMqH9n4GAUkD5Gbf7jSUo6Qe5YBp2Iefz/6RKpGdjPriIAcVPVUp1pI GiZRo+br31dhVtwYzevIrr49tWvSlpspLKPHtWIyr1VSw4oNUoegh5r4u7DaE2O+UH 7l6dpoHDLG1eEpZGcHKU0G5qIbhCAI4WZN2dlKMQ= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 22 Feb 2017 17:33:06 +1100 Message-Id: <20170222063348.32176-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170222063348.32176-1-david@gibson.dropbear.id.au> References: <20170222063348.32176-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 01/43] spapr: cpu core: separate child threads destruction from machine state operations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, imammedo@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov Split off destroying VCPU threads from drc callback spapr_core_release() into new spapr_cpu_core_unrealizefn() which takes care of internal cpu core state cleanup (i.e. VCPU threads) and is called when object_unparent(core) is called. That leaves spapr_core_release() only with board mgmt code, which will be moved to board related file in follow up patch along with the rest on hotplug callbacks. Signed-off-by: Igor Mammedov Reviewed-by: Bharata B Rao Signed-off-by: David Gibson --- hw/ppc/spapr_cpu_core.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 9dddaeb..b9e5f80 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -111,11 +111,19 @@ char *spapr_get_cpu_core_type(const char *model) =20 static void spapr_core_release(DeviceState *dev, void *opaque) { + sPAPRMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); + CPUCore *cc =3D CPU_CORE(dev); + + spapr->cores[cc->core_id / smp_threads] =3D NULL; + object_unparent(OBJECT(dev)); +} + +static void spapr_cpu_core_unrealizefn(DeviceState *dev, Error **errp) +{ sPAPRCPUCore *sc =3D SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCoreClass *scc =3D SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev)); const char *typename =3D object_class_get_name(scc->cpu_class); size_t size =3D object_type_get_instance_size(typename); - sPAPRMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); CPUCore *cc =3D CPU_CORE(dev); int i; =20 @@ -129,11 +137,7 @@ static void spapr_core_release(DeviceState *dev, void = *opaque) cpu_remove_sync(cs); object_unparent(obj); } - - spapr->cores[cc->core_id / smp_threads] =3D NULL; - g_free(sc->threads); - object_unparent(OBJECT(dev)); } =20 void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, @@ -368,6 +372,7 @@ void spapr_cpu_core_class_init(ObjectClass *oc, void *d= ata) sPAPRCPUCoreClass *scc =3D SPAPR_CPU_CORE_CLASS(oc); =20 dc->realize =3D spapr_cpu_core_realize; + dc->unrealize =3D spapr_cpu_core_unrealizefn; scc->cpu_class =3D cpu_class_by_name(TYPE_POWERPC_CPU, data); g_assert(scc->cpu_class); } --=20 2.9.3