From nobody Mon Feb 9 20:12:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1578324850; cv=none; d=zohomail.com; s=zohoarc; b=MaagJOuQTHhToNkIwHoFT1Kz8CPMjtd/H6Aj/CmTH7QG1eJ1wo5kaaJEQyBWvOoW+AZjCtekRZ+ozEUcPmGnbNbtW9LMRtMUSAi5+nTWb2ALYAY+uHVQfwKZ7htnETLSzyWy5G+/77jOi54501Kx1ch+g5DlD4DwcnXi9WuDM0o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578324850; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=je7DrSeiEj4NhfHfVO+ga1L7xnp1OV/m0DqFZ/tFO78=; b=hm8PFUDPN7uF3t+yrB6gschee/xn4g7NSBl2IyzmnxRsiG/0wXb/osL2EaEuqD0L8GUtYip+xhhBkh2E1GM+F4QMkzOkyiWNVwXi313qFDfSsRKrQ6biaXPnOIxYyUwAFrdikYwo2xuLzNNa5mQ3Pi9tLhzV2gI1CrGbHCh1jFc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578324850973528.337853700642; Mon, 6 Jan 2020 07:34:10 -0800 (PST) Received: from localhost ([::1]:53640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioUOP-00072v-I7 for importer@patchew.org; Mon, 06 Jan 2020 10:34:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50148) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioTpb-0001cH-QI for qemu-devel@nongnu.org; Mon, 06 Jan 2020 09:58:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioTpa-0001UY-GL for qemu-devel@nongnu.org; Mon, 06 Jan 2020 09:58:11 -0500 Received: from 4.mo68.mail-out.ovh.net ([46.105.59.63]:59412) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ioTpa-0001Sl-A1 for qemu-devel@nongnu.org; Mon, 06 Jan 2020 09:58:10 -0500 Received: from player731.ha.ovh.net (unknown [10.108.42.145]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id CE3C0155AAE for ; Mon, 6 Jan 2020 15:58:07 +0100 (CET) Received: from kaod.org (deibp9eh1--blueice1n4.emea.ibm.com [195.212.29.166]) (Authenticated sender: clg@kaod.org) by player731.ha.ovh.net (Postfix) with ESMTPSA id 35281DB3A926; Mon, 6 Jan 2020 14:58:00 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Subject: [PATCH v3 12/12] pnv/psi: Consolidate some duplicated code in pnv_psi_realize() Date: Mon, 6 Jan 2020 15:56:45 +0100 Message-Id: <20200106145645.4539-13-clg@kaod.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200106145645.4539-1-clg@kaod.org> References: <20200106145645.4539-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 5404038079288347622 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrvdehtddgjedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepveorughrihgtucfnvgcuifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucfkpheptddrtddrtddrtddpudelhedrvdduvddrvdelrdduieeinecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejfedurdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomheptghlgheskhgrohgurdhorhhgpdhrtghpthhtohepqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpeef Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.59.63 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: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, Greg Kurz , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Greg Kurz The proper way to do that would be to use device_class_set_parent_realize(), but defining a Pnv8PsiClass and a Pnv9PsiClass types with a parent_realize pointer adds a fair amount of code. Calling pnv_psi_realize() explicitely is fine for now. This should probably be achieved with a device realize hook in the PSI base class and device_class_set_parent_realize() in the children classes. Signed-off-by: Greg Kurz Signed-off-by: C=C3=A9dric Le Goater --- hw/ppc/pnv_psi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index cf21e42d93b7..ce7717ccb151 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -471,6 +471,16 @@ static void pnv_psi_reset_handler(void *dev) dc->reset(DEVICE(dev)); } =20 +static void pnv_psi_realize(DeviceState *dev, Error **errp) +{ + PnvPsi *psi =3D PNV_PSI(dev); + + /* Default BAR for MMIO region */ + pnv_psi_set_bar(psi, psi->bar | PSIHB_BAR_EN); + + qemu_register_reset(pnv_psi_reset_handler, dev); +} + static void pnv_psi_power8_instance_init(Object *obj) { Pnv8Psi *psi8 =3D PNV8_PSI(obj); @@ -523,9 +533,6 @@ static void pnv_psi_power8_realize(DeviceState *dev, Er= ror **errp) memory_region_init_io(&psi->regs_mr, OBJECT(dev), &psi_mmio_ops, psi, "psihb", PNV_PSIHB_SIZE); =20 - /* Default BAR for MMIO region */ - pnv_psi_set_bar(psi, psi->bar | PSIHB_BAR_EN); - /* Default sources in XIVR */ for (i =3D 0; i < PSI_NUM_INTERRUPTS; i++) { uint8_t xivr =3D irq_to_xivr[i]; @@ -533,7 +540,7 @@ static void pnv_psi_power8_realize(DeviceState *dev, Er= ror **errp) ((uint64_t) i << PSIHB_XIVR_SRC_SH); } =20 - qemu_register_reset(pnv_psi_reset_handler, dev); + pnv_psi_realize(dev, errp); } =20 static int pnv_psi_dt_xscom(PnvXScomInterface *dev, void *fdt, int xscom_o= ffset) @@ -868,9 +875,7 @@ static void pnv_psi_power9_realize(DeviceState *dev, Er= ror **errp) memory_region_init_io(&psi->regs_mr, OBJECT(dev), &pnv_psi_p9_mmio_ops= , psi, "psihb", PNV9_PSIHB_SIZE); =20 - pnv_psi_set_bar(psi, psi->bar | PSIHB_BAR_EN); - - qemu_register_reset(pnv_psi_reset_handler, dev); + pnv_psi_realize(dev, errp); } =20 static void pnv_psi_power9_class_init(ObjectClass *klass, void *data) --=20 2.21.1