From patchwork Thu Oct 19 13:13:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 735550 Delivered-To: patch@linaro.org Received: by 2002:adf:f0cd:0:b0:32d:baff:b0ca with SMTP id x13csp1508902wro; Thu, 19 Oct 2023 06:14:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTwl6sGFRLsax8p0Cd5lrmApe6mAbujVupIBLzXXupIPnrPnKtZITTfPPRWpMp73AQTtWE X-Received: by 2002:a2e:b616:0:b0:2c5:1482:719a with SMTP id r22-20020a2eb616000000b002c51482719amr1426917ljn.21.1697721279492; Thu, 19 Oct 2023 06:14:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697721279; cv=none; d=google.com; s=arc-20160816; b=E6dkhA95mLlD/7+Nt9D/Bm9D7zKJ6hizf4n5QvH35JGl5uKGW7McML4ke1jEe/LiBo VUNyYx+212tayahtjAIXahrXLc/FZ4mZ6QCwz2pL4fXR4XVQa2TbkrFfX5j1/cOl77tx Qcfz38E5N3f4cuC4ybbHuPrTbw+5SZiAu4zftYk+pPJ7RRB63Vio7gghin4oVMtewjSm Q37wLsRkvwYi1oyR53yE7c23hRib7IG/haE0xpHbowGvV4cDr3XSxdysUA8RnKPznKt8 NRiazQvT17JiGnc6iWeoO0V+m05Pq1/7Z76246OgAiC6hOCfUQuoNfWKlwSP2c0H8YQn PD3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ldJFXb9fdD2sfJu6FP/y4XyBQnTwT0OjDzwlspACaHE=; fh=pKSa3NIqn0GzXJAy/2EwD+riYoiBTvQWIw5svo/o4rg=; b=BH70FeLvKAzcm5Vl1IOQplZcPXmIQpC40swmVjK7owtSeyzKKuhwmW91ycbQ1rg5gQ dCGp5EKMgeYcaFjUHWcqHQ1uJcNbSHHTgdn9Xbaeb+QRIoaJNvIYsfMHlAQmRuLWgl0Q 6zLJp8Lp/3yO8XnTPk4Amky3QFTyX4TNLgf3MhMYaJDHJt7F+RI+C7HQTJIuAW73Re4m fakpJV8ACc4mtM0rgJL3ivrQXEQq1Rtu78TH/EBpUOXim7dTUGxXR7212a0fBpVqIsim skgkWHy/9HO6ue+ElEc8AeI7Kcfwi6O/R0DKqAmKpphlLzv67PhPAF6WyngrVdp1oIiF UqgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jR/NU8jJ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i18-20020a5d5592000000b0032d912000e1si2687176wrv.502.2023.10.19.06.14.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Oct 2023 06:14:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jR/NU8jJ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtSr6-0000aR-E5; Thu, 19 Oct 2023 09:14:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtSq5-0007LQ-2y for qemu-devel@nongnu.org; Thu, 19 Oct 2023 09:13:30 -0400 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtSq2-0002Sz-Vn for qemu-devel@nongnu.org; Thu, 19 Oct 2023 09:13:24 -0400 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2c50cf61f6dso91433421fa.2 for ; Thu, 19 Oct 2023 06:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697721201; x=1698326001; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ldJFXb9fdD2sfJu6FP/y4XyBQnTwT0OjDzwlspACaHE=; b=jR/NU8jJ5LO3DqRLNXoJ+YzJfle8KgeLvIYXMMjX/D0Y8mPtOYrgbl+2v5CHjnKDLZ cBm2dK2aOkGktzAY4S8Zd9OQJohNmJcrHBfWIXThz0+O+Ccrqyr2vZBrj/2qeGdTG8ts mcfNwjAs2vf77MyuvsYf9r/oKlM88Ask8dUpm3TA5NcA9/uoMaRz4ztp8OJIbsbBCt3R agRS6zBWTihq7u3Smvf/G0kXar+17je8AaPX6g+8Gc7kd9WjrVbKoXdvH+f9ThkgxJdA ci9TTdz4K1+oDJsjlOyzU+4cZlZkFP5Wrb+dlPjYB7gKIWLN4Aj3seSakzRsyb4D7Ehy rCUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697721201; x=1698326001; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ldJFXb9fdD2sfJu6FP/y4XyBQnTwT0OjDzwlspACaHE=; b=jTs2P9BoumKLUMFA509otan0oOMeMir/nmy/3c2RAaS8GoJ/Eu421D1IDrHyH5JrGI /SFWFLzPcWuLaDebirPkTWzgRxQKEp8JfF7jjyf0fh96FodbuLOfCf83BqATRicBMBFf I8UyuNFhD/e8XpWyG8XWxvpaE7P3tsjYS1yL7knh76yUmo9vP202l+auvkUX1VjVi0Bp gb8BNn72T1dgV3wFrCFzADTPkREVboB4hYuvbKjRFmXWOO26EZ9+isKoxODRhXYreu60 SFu7Es/Vqcn59yadvzSoV/d00ZwT9lilXfHfg5pzSoKPOf/g44y6z1WLgXgEezK9zVRF uALQ== X-Gm-Message-State: AOJu0YwdXyfIj+x7LCrYcdCMx//jFe7ZnKgZO1EEgWOy9Wet/f+SmIXq xIt40CCIBvc02/AnX+nj+XeOIq0+wKHUF3QHDuI0Xw== X-Received: by 2002:a19:5f53:0:b0:507:a003:57a2 with SMTP id a19-20020a195f53000000b00507a00357a2mr1677205lfj.52.1697721201002; Thu, 19 Oct 2023 06:13:21 -0700 (PDT) Received: from m1x-phil.lan (176-131-216-177.abo.bbox.fr. [176.131.216.177]) by smtp.gmail.com with ESMTPSA id q7-20020adffec7000000b0031980294e9fsm4462971wrs.116.2023.10.19.06.13.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Oct 2023 06:13:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Richard Henderson , =?utf-8?b?RnLDqWTDqXJpYyBCYXJyYXQ=?= , Harsh Prateek Bora , David Gibson , Nicholas Piggin , =?utf-8?q?C=C3=A9dric_Le_Goater?= , LIU Zhiwei , Daniel Henrique Barboza , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/7] hw/ppc/pnv_xscom: Rename pnv_xscom_realize(Error **) -> pnv_xscom_init() Date: Thu, 19 Oct 2023 15:13:00 +0200 Message-ID: <20231019131305.19157-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019131305.19157-1-philmd@linaro.org> References: <20231019131305.19157-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22e; envelope-from=philmd@linaro.org; helo=mail-lj1-x22e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org pnv_xscom_realize() is not used to *realize* QDev object, rename it as pnv_xscom_init(). The Error** argument is unused: remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: LIU Zhiwei --- include/hw/ppc/pnv_xscom.h | 2 +- hw/ppc/pnv.c | 18 +++--------------- hw/ppc/pnv_xscom.c | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h index 9bc6463547..41671001da 100644 --- a/include/hw/ppc/pnv_xscom.h +++ b/include/hw/ppc/pnv_xscom.h @@ -170,7 +170,7 @@ struct PnvXScomInterfaceClass { #define PNV10_XSCOM_PEC_PCI_BASE 0x8010800 /* index goes upwards ... */ #define PNV10_XSCOM_PEC_PCI_SIZE 0x200 -void pnv_xscom_realize(PnvChip *chip, uint64_t size, Error **errp); +void pnv_xscom_init(PnvChip *chip, uint64_t size); int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset, uint64_t xscom_base, uint64_t xscom_size, const char *compat, int compat_size); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index eb54f93986..456631c9dc 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1249,11 +1249,7 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp) assert(chip8->xics); /* XSCOM bridge is first */ - pnv_xscom_realize(chip, PNV_XSCOM_SIZE, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } + pnv_xscom_init(chip, PNV_XSCOM_SIZE); sysbus_mmio_map(SYS_BUS_DEVICE(chip), 0, PNV_XSCOM_BASE(chip)); pcc->parent_realize(dev, &local_err); @@ -1512,11 +1508,7 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp) Error *local_err = NULL; /* XSCOM bridge is first */ - pnv_xscom_realize(chip, PNV9_XSCOM_SIZE, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } + pnv_xscom_init(chip, PNV9_XSCOM_SIZE); sysbus_mmio_map(SYS_BUS_DEVICE(chip), 0, PNV9_XSCOM_BASE(chip)); pcc->parent_realize(dev, &local_err); @@ -1727,11 +1719,7 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp) Error *local_err = NULL; /* XSCOM bridge is first */ - pnv_xscom_realize(chip, PNV10_XSCOM_SIZE, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } + pnv_xscom_init(chip, PNV10_XSCOM_SIZE); sysbus_mmio_map(SYS_BUS_DEVICE(chip), 0, PNV10_XSCOM_BASE(chip)); pcc->parent_realize(dev, &local_err); diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index d820e05e40..af57b55863 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -221,7 +221,7 @@ const MemoryRegionOps pnv_xscom_ops = { .endianness = DEVICE_BIG_ENDIAN, }; -void pnv_xscom_realize(PnvChip *chip, uint64_t size, Error **errp) +void pnv_xscom_init(PnvChip *chip, uint64_t size) { SysBusDevice *sbd = SYS_BUS_DEVICE(chip); char *name;