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.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 99084C2BA2B for ; Mon, 13 Apr 2020 22:29:03 +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 2E43B20678 for ; Mon, 13 Apr 2020 22:29:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IXfBCMKi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E43B20678 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO7Ze-00081z-AE for qemu-devel@archiver.kernel.org; Mon, 13 Apr 2020 18:29:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47299) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jO7Yp-000786-VJ for qemu-devel@nongnu.org; Mon, 13 Apr 2020 18:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jO7Yo-0007IY-P6 for qemu-devel@nongnu.org; Mon, 13 Apr 2020 18:28:11 -0400 Received: from mail-vs1-xe43.google.com ([2607:f8b0:4864:20::e43]:37516) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jO7Yo-0007IG-In; Mon, 13 Apr 2020 18:28:10 -0400 Received: by mail-vs1-xe43.google.com with SMTP id o3so6501475vsd.4; Mon, 13 Apr 2020 15:28:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=IgQGUuxle6BaPq/Rsmd+GO9sIThVBU3XLIo15nIFw6Y=; b=IXfBCMKiTUzw0OzD9s23PjVBfWlyuPBXznGIbW0C7gaZrEG87YjAYGAfWDdXSkpL7r yR4ZfVCzZz9TCIqbi45m7nqBMqZgD4UIVo74Y5Vd3g4gqZgk5oefmoS9bMt2WSrXhzhy rSRHWGdmx7ua9GPFvEA2MDydtnKMI+O/OA53il2Vx9AdaaJRQ1Qh+kJXeAV4wHhE6W9n RNXTl6b/HZy6z0V+hXnEwZxj0JhOCy35rkMXhTMcihwJy88fHsFpEB+rqGRpjIXy+wFw 7jQx3XoMU7/JBd/ETHB01H5y9qTiMciTfd9fXOgHJimT4vBSp2wxQnRVkzanQg8opXQf JxzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=IgQGUuxle6BaPq/Rsmd+GO9sIThVBU3XLIo15nIFw6Y=; b=XdfTTgL45noLLsNn/qL90lv3XcTMUrbe4WMeQCRmDcNy6l7Wj4muK9kvneEroSTVHz 4k39ID8VJPB8CqvGfRpVMLGD9dsXXZA+4LRBrp2z3LQB+xdLwQo8Vj4el3/X1hi4rjti 7DMJqUVk3hPrxfqP17r4M48jVLJmFYcBrnKOGprIVanRBK4uSb5j157wkR/sxw/+ZcHU l6GPYBoWLsMPK72kB1puHpDB/0ROtPtGh0wrn4CWuFsv1hH+0zEoYW+eArO3wwHcV/g+ 28Xl+yRYNZM4ns7YuQhx0MiWnaAOMKjCCzmVtdYlAkyS2sNl7MpHc8erivqRnK2DYoye WOTw== X-Gm-Message-State: AGi0PuaYdc4SbuOET7sQPKRcxh++YyIyKhnV9kX+W5wO4SI58y+qJr8q MAYTUBCZDCQ62JUrbNRDLB3ErD3yYCsrnxRC5zo= X-Google-Smtp-Source: APiQypKKDInw8eVnMl9zHZEwt4fp2L+/Hx80NxHVUtxQVWdVXjrf9OSDb0LOvzTdBcpNEWUgukwBOYFx7TDV0OnEUrU= X-Received: by 2002:a67:26c2:: with SMTP id m185mr14426951vsm.180.1586816890037; Mon, 13 Apr 2020 15:28:10 -0700 (PDT) MIME-Version: 1.0 References: <20200412223619.11284-1-f4bug@amsat.org> <20200412223619.11284-18-f4bug@amsat.org> In-Reply-To: <20200412223619.11284-18-f4bug@amsat.org> From: Alistair Francis Date: Mon, 13 Apr 2020 15:19:54 -0700 Message-ID: Subject: Re: [PATCH-for-5.1 v3 17/24] hw/microblaze/xlnx-zynqmp-pmu: Move some code from realize() to init() To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::e43 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 Developers" , Alistair Francis , "Edgar E. Iglesias" , Max Reitz , Qemu-block , Markus Armbruster , Joel Stanley , =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= , David Gibson , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Eduardo Habkost , Jean-Christophe Dubois , Xie Changlong , Alistair Francis , Beniamino Galvani , qemu-arm , Peter Chubb , =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , "open list:New World" , Richard Henderson , Kevin Wolf , "open list:RISC-V" , 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" On Sun, Apr 12, 2020 at 3:44 PM Philippe Mathieu-Daud=C3=A9 wrote: > > Coccinelle reported: > > $ spatch ... --timeout 60 --sp-file \ > scripts/coccinelle/simplify-init-realize-error_propagate.cocci > HANDLING: ./hw/microblaze/xlnx-zynqmp-pmu.c > >>> possible moves from xlnx_zynqmp_pmu_soc_init() to xlnx_zynqmp_pmu_s= oc_realize() in ./hw/microblaze/xlnx-zynqmp-pmu.c:79 > > Move the calls using &error_abort which don't depend on input > updated before realize() to init(). > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Alistair > --- > v3: Typo 'depend of' -> 'depend on' (eblake) > --- > hw/microblaze/xlnx-zynqmp-pmu.c | 46 ++++++++++++++++----------------- > 1 file changed, 23 insertions(+), 23 deletions(-) > > diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-= pmu.c > index 028f31894d..2aa602cf85 100644 > --- a/hw/microblaze/xlnx-zynqmp-pmu.c > +++ b/hw/microblaze/xlnx-zynqmp-pmu.c > @@ -63,24 +63,6 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj) > > object_initialize_child(obj, "pmu-cpu", &s->cpu, sizeof(s->cpu), > TYPE_MICROBLAZE_CPU, &error_abort, NULL); > - > - sysbus_init_child_obj(obj, "intc", &s->intc, sizeof(s->intc), > - TYPE_XLNX_PMU_IO_INTC); > - > - /* Create the IPI device */ > - for (int i =3D 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) { > - char *name =3D g_strdup_printf("ipi%d", i); > - sysbus_init_child_obj(obj, name, &s->ipi[i], > - sizeof(XlnxZynqMPIPI), TYPE_XLNX_ZYNQMP_IP= I); > - g_free(name); > - } > -} > - > -static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) > -{ > - XlnxZynqMPPMUSoCState *s =3D XLNX_ZYNQMP_PMU_SOC(dev); > - Error *err =3D NULL; > - > object_property_set_uint(OBJECT(&s->cpu), XLNX_ZYNQMP_PMU_ROM_ADDR, > "base-vectors", &error_abort); > object_property_set_bool(OBJECT(&s->cpu), true, "use-stack-protectio= n", > @@ -99,18 +81,36 @@ static void xlnx_zynqmp_pmu_soc_realize(DeviceState *= dev, Error **errp) > object_property_set_str(OBJECT(&s->cpu), "8.40.b", "version", > &error_abort); > object_property_set_uint(OBJECT(&s->cpu), 0, "pvr", &error_abort); > - object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err); > - if (err) { > - error_propagate(errp, err); > - return; > - } > > + sysbus_init_child_obj(obj, "intc", &s->intc, sizeof(s->intc), > + TYPE_XLNX_PMU_IO_INTC); > object_property_set_uint(OBJECT(&s->intc), 0x10, "intc-intr-size", > &error_abort); > object_property_set_uint(OBJECT(&s->intc), 0x0, "intc-level-edge", > &error_abort); > object_property_set_uint(OBJECT(&s->intc), 0xffff, "intc-positive", > &error_abort); > + > + /* Create the IPI device */ > + for (int i =3D 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) { > + char *name =3D g_strdup_printf("ipi%d", i); > + sysbus_init_child_obj(obj, name, &s->ipi[i], > + sizeof(XlnxZynqMPIPI), TYPE_XLNX_ZYNQMP_IP= I); > + g_free(name); > + } > +} > + > +static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) > +{ > + XlnxZynqMPPMUSoCState *s =3D XLNX_ZYNQMP_PMU_SOC(dev); > + Error *err =3D NULL; > + > + object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err); > + if (err) { > + error_propagate(errp, err); > + return; > + } > + > object_property_set_bool(OBJECT(&s->intc), true, "realized", &err); > if (err) { > error_propagate(errp, err); > -- > 2.21.1 > >