From nobody Sat May 4 06:41:56 2024 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.zohomail.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 1504723802015890.2533762386246; Wed, 6 Sep 2017 11:50:02 -0700 (PDT) Received: from localhost ([::1]:37494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpfOi-0001Oz-Qz for importer@patchew.org; Wed, 06 Sep 2017 14:50:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpfIU-0004oO-3u for qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:43:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpfIP-0002gw-9g for qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:43:34 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:54724) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpfIP-0002gK-1B for qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:43:29 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v86Ied8J050673 for ; Wed, 6 Sep 2017 14:43:27 -0400 Received: from e11.ny.us.ibm.com (e11.ny.us.ibm.com [129.33.205.201]) by mx0a-001b2d01.pphosted.com with ESMTP id 2ctpfjgbqk-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 06 Sep 2017 14:43:27 -0400 Received: from localhost by e11.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Sep 2017 14:43:21 -0400 Received: from b01cxnp22036.gho.pok.ibm.com (9.57.198.26) by e11.ny.us.ibm.com (146.89.104.198) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 6 Sep 2017 14:43:19 -0400 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v86IhIZO31064292; Wed, 6 Sep 2017 18:43:18 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 168E4AC046; Wed, 6 Sep 2017 14:43:46 -0400 (EDT) Received: from localhost.localdomain (unknown [9.85.142.241]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP id 6F451AC03F; Wed, 6 Sep 2017 14:43:44 -0400 (EDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Date: Wed, 6 Sep 2017 15:43:05 -0300 X-Mailer: git-send-email 2.9.4 X-TM-AS-GCONF: 00 x-cbid: 17090618-2213-0000-0000-000002161A75 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007678; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000226; SDB=6.00913192; UDB=6.00458304; IPR=6.00693454; BA=6.00005574; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017036; XFM=3.00000015; UTC=2017-09-06 18:43:21 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17090618-2214-0000-0000-000057747FA0 Message-Id: <20170906184305.2612-1-danielhb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-06_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709060265 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH] hw/ppc/spapr.c: cleaning up qdev_get_machine() calls 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: qemu-ppc@nongnu.org, mdroth@linux.vnet.ibm.com, david@gibson.dropbear.id.au 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" This patch removes the qdev_get_machine() calls that are made in spapr.c in situations where we can get an existing pointer for the MachineState by either passing it as an argument to the function or by using other already available pointers. The following changes were made: - spapr_node0_size: static function that is called two times: at spapr_setup_hpt_and_vrma and ppc_spapr_init. In both cases we can pass an existing MachineState pointer to it. - spapr_build_fdt: MachineState pointer can be retrieved from the existing sPAPRMachineState pointer. - spapr_boot_set: the opaque in the first arg is a sPAPRMachineState pointer as we can see inside ppc_spapr_init: qemu_register_boot_set(spapr_boot_set, spapr); We can get a MachineState pointer from it. - spapr_machine_device_plug and spapr_machine_device_unplug_request: the MachineState, sPAPRMachineState, MachineClass and sPAPRMachineClass pointers can all be retrieved from the HotplugHandler pointer. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Greg Kurz --- hw/ppc/spapr.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index cec441c..6ac3390 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -390,10 +390,8 @@ static int spapr_fixup_cpu_dt(void *fdt, sPAPRMachineS= tate *spapr) return ret; } =20 -static hwaddr spapr_node0_size(void) +static hwaddr spapr_node0_size(MachineState *machine) { - MachineState *machine =3D MACHINE(qdev_get_machine()); - if (nb_numa_nodes) { int i; for (i =3D 0; i < nb_numa_nodes; ++i) { @@ -1027,7 +1025,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, hwaddr rtas_addr, hwaddr rtas_size) { - MachineState *machine =3D MACHINE(qdev_get_machine()); + MachineState *machine =3D MACHINE(spapr); MachineClass *mc =3D MACHINE_GET_CLASS(machine); sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(machine); int ret; @@ -1347,7 +1345,7 @@ void spapr_setup_hpt_and_vrma(sPAPRMachineState *spap= r) spapr_reallocate_hpt(spapr, hpt_shift, &error_fatal); =20 if (spapr->vrma_adjust) { - spapr->rma_size =3D kvmppc_rma_size(spapr_node0_size(), + spapr->rma_size =3D kvmppc_rma_size(spapr_node0_size(MACHINE(spapr= )), spapr->htab_shift); } /* We're setting up a hash table, so that means we're not radix */ @@ -2007,7 +2005,7 @@ static SaveVMHandlers savevm_htab_handlers =3D { static void spapr_boot_set(void *opaque, const char *boot_device, Error **errp) { - MachineState *machine =3D MACHINE(qdev_get_machine()); + MachineState *machine =3D MACHINE(opaque); machine->boot_order =3D g_strdup(boot_device); } =20 @@ -2154,7 +2152,7 @@ static void ppc_spapr_init(MachineState *machine) MemoryRegion *rma_region; void *rma =3D NULL; hwaddr rma_alloc_size; - hwaddr node0_size =3D spapr_node0_size(); + hwaddr node0_size =3D spapr_node0_size(machine); long load_limit, fw_size; char *filename; Error *resize_hpt_err =3D NULL; @@ -3198,7 +3196,8 @@ out: static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(qdev_get_machine()); + MachineState *ms =3D MACHINE(hotplug_dev); + sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(ms); =20 if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { int node; @@ -3247,8 +3246,8 @@ static void spapr_machine_device_plug(HotplugHandler = *hotplug_dev, static void spapr_machine_device_unplug_request(HotplugHandler *hotplug_de= v, DeviceState *dev, Error **= errp) { - sPAPRMachineState *sms =3D SPAPR_MACHINE(qdev_get_machine()); - MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); + sPAPRMachineState *sms =3D SPAPR_MACHINE(OBJECT(hotplug_dev)); + MachineClass *mc =3D MACHINE_GET_CLASS(sms); =20 if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { if (spapr_ovec_test(sms->ov5_cas, OV5_HP_EVT)) { --=20 2.9.4