From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CEA0C2BA2B for ; Tue, 14 Apr 2020 02:32:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2584B2075E for ; Tue, 14 Apr 2020 02:32:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="e46lssns" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2584B2075E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOBNV-00030X-Bf for qemu-devel@archiver.kernel.org; Mon, 13 Apr 2020 22:32:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46530) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOBMB-0001OO-Ol for qemu-devel@nongnu.org; Mon, 13 Apr 2020 22:31:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOBMA-0003M5-EX for qemu-devel@nongnu.org; Mon, 13 Apr 2020 22:31:23 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:33649 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOBM4-00030w-RZ; Mon, 13 Apr 2020 22:31:17 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 491Tvw2Mxtz9sTv; Tue, 14 Apr 2020 12:26:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1586831372; bh=z+ZKS6N1wAGyfVLEACnmrKqjFBePx1Vp+lIM3SeVP6U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=e46lssns7GrXbiOHAinFwEZTAsbwbhpeQa3K8t+xcvIEBlJ34blXEgeXKGvUpbsxv qhw9bR+kFi2VApTAipF/1zLMiYBhaNdOtfQPbHHOWnOVgF+rhNshx+NgYURnw9+KFI eQj1E+OBwH09U8+neeEGTVRI1ubwizuTeBgRUxkQ= Date: Tue, 14 Apr 2020 12:10:29 +1000 From: David Gibson To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Subject: Re: [PATCH-for-5.1 v3 18/24] hw/pci-host/pnv_phb3: Move some code from realize() to init() Message-ID: <20200414021029.GH48061@umbus.fritz.box> References: <20200412223619.11284-1-f4bug@amsat.org> <20200412223619.11284-19-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="G3juXO9GfR42w+sw" Content-Disposition: inline In-Reply-To: <20200412223619.11284-19-f4bug@amsat.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , Sagar Karandikar , "Michael S. Tsirkin" , Jeff Cody , Jason Wang , qemu-devel@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Max Reitz , qemu-block@nongnu.org, Markus Armbruster , Joel Stanley , qemu-ppc@nongnu.org, Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Eduardo Habkost , Jean-Christophe Dubois , Xie Changlong , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , =?iso-8859-1?Q?C=E9dric?= Le Goater , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Richard Henderson , Kevin Wolf , qemu-riscv@nongnu.org, Andrew Jeffery , Wen Congyang , Subbaraya Sundeep , Palmer Dabbelt , Bastian Koppelmann , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --G3juXO9GfR42w+sw Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 13, 2020 at 12:36:13AM +0200, Philippe Mathieu-Daud=E9 wrote: > Coccinelle reported: >=20 > $ spatch ... --timeout 60 --sp-file \ > scripts/coccinelle/simplify-init-realize-error_propagate.cocci > HANDLING: ./hw/pci-host/pnv_phb3.c > >>> possible moves from pnv_phb3_instance_init() to pnv_phb3_realize() = in ./hw/pci-host/pnv_phb3.c:992 >=20 > Move the calls using &error_abort which don't depend on input > updated before realize() to init(). >=20 > Signed-off-by: Philippe Mathieu-Daud=E9 Acked-by: David Gibson > --- > v3: Typo 'depend of' -> 'depend on' (eblake) > --- > hw/pci-host/pnv_phb3.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c > index 74618fadf0..57d717ed23 100644 > --- a/hw/pci-host/pnv_phb3.c > +++ b/hw/pci-host/pnv_phb3.c > @@ -970,6 +970,8 @@ static void pnv_phb3_instance_init(Object *obj) > /* LSI sources */ > object_initialize_child(obj, "lsi", &phb->lsis, sizeof(phb->lsis), > TYPE_ICS, &error_abort, NULL); > + object_property_set_int(OBJECT(&phb->lsis), PNV_PHB3_NUM_LSI, "nr-ir= qs", > + &error_abort); > =20 > /* Default init ... will be fixed by HW inits */ > phb->lsis.offset =3D 0; > @@ -977,6 +979,8 @@ static void pnv_phb3_instance_init(Object *obj) > /* MSI sources */ > object_initialize_child(obj, "msi", &phb->msis, sizeof(phb->msis), > TYPE_PHB3_MSI, &error_abort, NULL); > + object_property_set_int(OBJECT(&phb->msis), PHB3_MAX_MSI, "nr-irqs", > + &error_abort); > =20 > /* Power Bus Common Queue */ > object_initialize_child(obj, "pbcq", &phb->pbcq, sizeof(phb->pbcq), > @@ -1005,8 +1009,6 @@ static void pnv_phb3_realize(DeviceState *dev, Erro= r **errp) > /* LSI sources */ > object_property_set_link(OBJECT(&phb->lsis), OBJECT(pnv), "xics", > &error_abort); > - object_property_set_int(OBJECT(&phb->lsis), PNV_PHB3_NUM_LSI, "nr-ir= qs", > - &error_abort); > object_property_set_bool(OBJECT(&phb->lsis), true, "realized", &loca= l_err); > if (local_err) { > error_propagate(errp, local_err); > @@ -1024,8 +1026,6 @@ static void pnv_phb3_realize(DeviceState *dev, Erro= r **errp) > &error_abort); > object_property_set_link(OBJECT(&phb->msis), OBJECT(pnv), "xics", > &error_abort); > - object_property_set_int(OBJECT(&phb->msis), PHB3_MAX_MSI, "nr-irqs", > - &error_abort); > object_property_set_bool(OBJECT(&phb->msis), true, "realized", &loca= l_err); > if (local_err) { > error_propagate(errp, local_err); --=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 --G3juXO9GfR42w+sw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl6VG5UACgkQbDjKyiDZ s5KtbA/+Mv4pdUqhOpQqcFoIV3GcQcu+ytXfzeZYa3WuvIGGyDPRFVliSiHz9DHr uxMGDIZtPKWJ442M9e4jMpF7N4X29+7mcNRg/NlGTX3Het5P2dnz3ETLLCcqoOun 4pe7XMT3pE6GT9ZyhINHLlFmpCZSLJc5jxGS9XDe49Chd+HvgkvYGdwHFr8soI9T hY9TdLxsG2kW/ETst/QKV5MELhk8xsv18saS3Y7rnvo2R72nvgdGc1Z80QTJKGMT /1tySYfSrgYaIi0qnWbUk2otd7l2e4cErZBuZA0kVN+Gqp6MjwPxmV90jokZrTL4 9oHBCzTMCW94yAtKUMuXmxqifTmY7pakOjED0tx2uDa19ilhy/X4dIXIH8oBWvgN 6+oG1JorCkndBOL9g0BqzwfRAdIiq+ZbEUE0pkyLartmd4XhJfk6pIIeUHSYzhwx DeTL/TfZPaSKYBAh7pdJY43S57E6vrvIwvE3MP8BvwhrWBMQ66+tWOcDC8C6xv06 51Jirlqw1uBiXblJbLqhCiIg+DQ/HhwumkyLCzfj6dkX3WeOF40vIdcXYQKUISFC RkM3EZbzUHTUW2BCs5ktiz45KEVUbDOJQN0Z25zXMDn4DOMteAsnvZXDops8kS3S oS8U0oet+93OFbqWjGBzbj9OrpkiWMsWVpCkBKGOyeBY0PeVFKg= =476g -----END PGP SIGNATURE----- --G3juXO9GfR42w+sw--