From nobody Fri Nov 14 18:17:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760077203; cv=none; d=zohomail.com; s=zohoarc; b=aPNLmoWcrPHXoqNRP7Dxb79lxNQXDzu99CHcr/1LHAHFVHD9lGIMqQ7JsH6fskuzrGLD1faQT08lQ4LQ+5aJOxCPYHH0NTR0MTI8p99RhYkC2ZF/9nevRvr3IChmRnAf6uusebsR0ioVwnYN64BN81pWPK0Mv0pCl2F2oEjl1IU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760077203; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=96TZGDASTr7bkfhHVGvxBafMfwww43RZcVo8qqBiSF8=; b=gjX0yeEtmiIkzOFd0BaySloh9LKCkU5ilf7B3ZDNmq7/on/YIfLilPro+1jNGiKH8lYXJ+qR+xL4JL/IlJdIGsdZGHeZ9HhHCj1brewoPfcxH2pWt2UAX1YDvbgFjihsNEaOqmpq2CalUpexxb9NRP5JbynqDyxb6RLrBofkPMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760077203536735.6528064759614; Thu, 9 Oct 2025 23:20:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v76T0-0001eY-QM; Fri, 10 Oct 2025 02:19:02 -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 1v76Sq-0001Zg-9J for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:18:55 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v76Sj-0001G9-Bg for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:18:52 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-46e4f2696bdso17907935e9.0 for ; Thu, 09 Oct 2025 23:18:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb4989601sm27988795e9.9.2025.10.09.23.18.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 23:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760077123; x=1760681923; 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=96TZGDASTr7bkfhHVGvxBafMfwww43RZcVo8qqBiSF8=; b=wWSQcORZhAfIR5GHtJ0ONQFl4tlog8OUQ/JBk1cwJLVfJsHlgT2XsfwSuoZEAlbVpe 7A4hjONTgrtIsaTuFoKBGlFgYBG7uLqd2TCn1cZMwuQQAmtwsUiMWh234FExnzWBy4/S 0kQUx5dWSUiQlkx7vzpQAgV02kkey+dHyYWZU3lz0Fuv+pD4eVxyUFDz31MPhdT6zeS9 YiKvRY4JnElMWU+ts2xn+V41h94b4dSaorKmJNed5ZTB/2eQdwPCdrDSpgmjdG4z2d8l +lJu4cZ9BckpR3PJ54+Tqsdp1tcROjo1TMihQK7ZarQ6fLHjbx+kH6XWF85r+I/dKM63 SRxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760077123; x=1760681923; 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=96TZGDASTr7bkfhHVGvxBafMfwww43RZcVo8qqBiSF8=; b=d83wx/wSbirZCCc4CuiyYdH8iu3f7RrBOCIvdmGLaTrkVETHUZI2tS9ZpBTScULuaP rWucQhHI2/ZxNw67ijr5GzOZ46Q/Zm2SiuToQ3D1i/04o26wKVfiZD+3ycbeWEoMEAWc lCqGLlGGkS+BH4+DeR2R258l0/ocKnSUebBkHHw4HcEiKvieSFe3rXxCV8AtDHQhZnJY 0EJf5WPeABkqchaCtdEqLslRPJc9CO+gImwRgrwnLYBj8dW55vmIKIx0h1e5XbqyMWps FI1PifcVWYVSSeQJVGV1PllczAfegCJu6RCdeKnx1NdKpDZ4zlKXB0zxOLRzIdrW/0ix qFyA== X-Gm-Message-State: AOJu0YxNM3HB5Ty4N2Sw/f8bt50fGblrZrooHd97JQ7tKL5HwbQyWsD+ 6tgDR8xT4uIJah5LaQKuHrUxPAqgfFtnXYwlz9zA2LpZ1ALfbyd9cATeQ3Vt1J1TFEzQh096A7u kaEEhGQ6d8g== X-Gm-Gg: ASbGncuvcU/2PtR1X8KVpsTHNlbVwRRTl0J6n4uEB86sBa6+P/Pnzn8/wo6zSInfZDp LI/YunoG3/MAhtzTcjszQ/j6486ZCFEUyvWznQBT2xfjkZSfe8RNynKoTXDemyYY+aBFdW6pC+h wIf1wgYVd4q9wppUrlEqCJ8ICZYWdLlb9DKjc2VyLVXOdQ1IEi9eaBweHQ2h2E8s+pLD1f6pEbx 8lRetYAUTF2ncVMGt9AkstwjEC8FEV6agZsQx7mW9Cxl2U3EIjkXoCzw9R2AuLHN1w0L2rhITNO AEoGpVbMviQ0WjYxupFjDdeVr6MB5f08eMcF6yazH2z3PMpmTgkNK6zxSI+XpQqu12HYqqRiJNk gyTXlLgTl22dyoz1IWdvPVA+JrXnJAdZjed0j8uXpmHNlKt5NeW4rLJhpiiV00OBiw9eWp7EEp7 KeHtbWLx2UB0JzauwZBJE73Gc1DXJQ83l6akQ= X-Google-Smtp-Source: AGHT+IH708eYU7HUaeAqWhnI4aTsxrVK+YKL+9hSWjickVluFlrAx3eKjUI0/MLg0LFWZNlhnRdMVg== X-Received: by 2002:a05:600c:1394:b0:45d:d1a3:ba6a with SMTP id 5b1f17b1804b1-46fa9b1706amr67712105e9.33.1760077122873; Thu, 09 Oct 2025 23:18:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Helge Deller , Anton Johansson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/6] hw/hppa: Convert type_init() -> DEFINE_TYPES() Date: Fri, 10 Oct 2025 08:18:31 +0200 Message-ID: <20251010061836.45739-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251010061836.45739-1-philmd@linaro.org> References: <20251010061836.45739-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760077206317154100 Prefer DEFINE_TYPES() macro over type_init() to register multiple QOM types. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/hppa/machine.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index dacedc5409c..2ab5fcb471a 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -709,16 +709,6 @@ static void HP_B160L_machine_init_class_init(ObjectCla= ss *oc, const void *data) nc->nmi_monitor_handler =3D hppa_nmi; } =20 -static const TypeInfo HP_B160L_machine_init_typeinfo =3D { - .name =3D MACHINE_TYPE_NAME("B160L"), - .parent =3D TYPE_MACHINE, - .class_init =3D HP_B160L_machine_init_class_init, - .interfaces =3D (const InterfaceInfo[]) { - { TYPE_NMI }, - { } - }, -}; - static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *= data) { static const char * const valid_cpu_types[] =3D { @@ -745,20 +735,24 @@ static void HP_C3700_machine_init_class_init(ObjectCl= ass *oc, const void *data) nc->nmi_monitor_handler =3D hppa_nmi; } =20 -static const TypeInfo HP_C3700_machine_init_typeinfo =3D { - .name =3D MACHINE_TYPE_NAME("C3700"), - .parent =3D TYPE_MACHINE, - .class_init =3D HP_C3700_machine_init_class_init, - .interfaces =3D (const InterfaceInfo[]) { - { TYPE_NMI }, - { } +static const TypeInfo hppa_machine_types[] =3D { + { + .name =3D MACHINE_TYPE_NAME("B160L"), + .parent =3D TYPE_MACHINE, + .class_init =3D HP_B160L_machine_init_class_init, + .interfaces =3D (const InterfaceInfo[]) { + { TYPE_NMI }, + { } + }, + }, { + .name =3D MACHINE_TYPE_NAME("C3700"), + .parent =3D TYPE_MACHINE, + .class_init =3D HP_C3700_machine_init_class_init, + .interfaces =3D (const InterfaceInfo[]) { + { TYPE_NMI }, + { } + }, }, }; =20 -static void hppa_machine_init_register_types(void) -{ - type_register_static(&HP_B160L_machine_init_typeinfo); - type_register_static(&HP_C3700_machine_init_typeinfo); -} - -type_init(hppa_machine_init_register_types) +DEFINE_TYPES(hppa_machine_types) --=20 2.51.0 From nobody Fri Nov 14 18:17:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760077223; cv=none; d=zohomail.com; s=zohoarc; b=fF8XkdzGIZfeo7HUZDfMWPC6TecDsDNHm6WWOYhm1BFCZhrBZuT4lZcG0/ocZ/ARbgHPdf4p5Lf5LMt/R1GQ4Ns4ui5nktq3rhLy1kWXgdPsgqidpk8G2uQFLlLqLHihfV3PFH3Wcb4e6T2s68CAWEpxsK05wYjmKw1+eJrm6Hg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760077223; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GvzJo9cmhQhu87w0cYmMX+C4spooPwgjzIRmxcjewMA=; b=XaVexX5fA48UIwZoT7fwUUrm2/MTrAhwKl1rlAMcGLn9ubqazVOPuf6amhhB8Yvl2vcn5R7dPcQq5Y/p/D1QZ4kPc1BW3yfD80J8q6lPKXSfS3drvgHFp9yctTou06FCJyLBQDD1MJ+c9pKl7vfCed5TmYpD6DxonPEWsQmQfB4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760077223523748.2204612343875; Thu, 9 Oct 2025 23:20:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v76T2-0001ga-QV; Fri, 10 Oct 2025 02:19:04 -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 1v76St-0001an-1a for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:18:55 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v76So-0001GO-1i for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:18:53 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-46e37d10f3eso12061225e9.0 for ; Thu, 09 Oct 2025 23:18:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb48a60b8sm30004575e9.19.2025.10.09.23.18.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 23:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760077128; x=1760681928; 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=GvzJo9cmhQhu87w0cYmMX+C4spooPwgjzIRmxcjewMA=; b=j9rLa1U3Fwd4693POENfPUYD+mP4UiMgxfOyqYOTz4Gi3ZyP6UTcaJlDgSu4s4phsG 0opjnzMRPFRvXrp526HdFijWE6K4EY9HoYft16ot0AlRHzckLJEKOATHGx00oXxXpkVX a1ltxVuqzsbspldA2Ua2pVdeWSrtiku08wRHIa0ibsnnDHbX0XbCIWiTVN7ICv9iPMSb Vr9fd1oiSHKZMdDLi4JuD5YbRx3pRpwGOCdG3y5ZGXcvUrzQZPAxiVB/HS0BK6560glb dAIyrLXTRgbGAYPMTvupHKOoeqNINj8ONDzGle5dbVmcjhj058ldCBdOTwxnBMJ+TghX i/bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760077128; x=1760681928; 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=GvzJo9cmhQhu87w0cYmMX+C4spooPwgjzIRmxcjewMA=; b=iA4jSmuTJYXrskCydfi2Bqq8TBEUguMzsP6nMU5gVGidKCe4QekjW41Lt8YSMUDmm5 pxFwfZFc+xMi+gWgCwXU7RjcEG8ze/t9LaCA67TWWJf3+Hcf6cW+b86MzSO4pY1QouAE xWpzfYjRvMh+O+uuCG4sUR6QF5Du3v8Behe90usGs3tYsaEqWuXLTVBzlz0brX2DRjm9 +5Mlljpo2WW+Rdg0l5W/W8j7qAwIof1hgK8gzcZ3I8z3rSrCcrlJA14xXgHinYWE3aMW hSVzRy69uaRw2W5rjqIigNR/A/+OwF9+uSm/QX3ImtS7aHcg6Mw+KUElQmUK9UvVxMHF mRmA== X-Gm-Message-State: AOJu0YyHyP3HYw2mqqwyPwIqwAmncRIbW8yf1pd7w8g0MKNwd54JL7QV UxMIODk/xeLQ0jQtXDvWvvvrV7/V6bTLKm1+U0deQguSBuoc5mzXCrIaI3nwO7GHYBTXc/ZHYDp kq8hU1rGkdg== X-Gm-Gg: ASbGncsk5Ytojnmk9dOM6NXVdWFSrY1QapHXDJM/1bh6NqYAV4qXDbWUNclNPZO/Z0I 5Sies/0dpnVzNpVSeD8ug8MqZPhKRnArHL2NiuC+rkhXOyR3IasgAfmpP3Vgf47/mPWGaKNyLiZ XYFbcFM7hMdgjU+PAFIJ3cFlWALgtaUIB5O44mye+s+CDgd1HUJv9ffB3zZKMvOSboBhDX0hjWF JRe6t7HTlxmcXRn3ph4sZs3Z33Z7Tr2rY4xPu2u88+jEFdBJw7/yZRUFrm6jK/8fgX13Pwb7RID T7mBjQwkSDb2erkms2QpxuLoOqmwySK1H4hryoBS54hhQZQyXo3j8yid5uTtyD+EhLAjbvG0pcY /TCKH2VKWJcEvLzYdS8uxFHGzwLL5nyBeYSLtHrMMaUyQ7zp+GpYiD/Z1n/BXd7EEj+jyGN11xw IfXWGIJjfM4PZbuFJcovJ7vJoi X-Google-Smtp-Source: AGHT+IExUsMpo+9SBmRBW4aH4fNGsHB3CWSX95VtDvC1gzH2SKf42QG6uMY2foyNeHBmfzdBl38ZmQ== X-Received: by 2002:a05:600c:a104:b0:46e:4329:a4d1 with SMTP id 5b1f17b1804b1-46fa9a945abmr48387225e9.4.1760077127574; Thu, 09 Oct 2025 23:18:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Helge Deller , Anton Johansson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/6] hw/hppa: Factor QOM HPPA_COMMON_MACHINE out Date: Fri, 10 Oct 2025 08:18:32 +0200 Message-ID: <20251010061836.45739-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251010061836.45739-1-philmd@linaro.org> References: <20251010061836.45739-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760077227564116600 B160L and C3700 share a lot of common code. Factor it out as an abstract HPPA_COMMON_MACHINE QOM parent. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/hppa/machine.c | 61 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 2ab5fcb471a..c8da159a114 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -36,6 +36,13 @@ #include "net/net.h" #include "qemu/log.h" =20 +#define TYPE_HPPA_COMMON_MACHINE MACHINE_TYPE_NAME("hppa-common") +OBJECT_DECLARE_SIMPLE_TYPE(HppaMachineState, HPPA_COMMON_MACHINE) + +struct HppaMachineState { + MachineState parent_obj; +}; + #define MIN_SEABIOS_HPPA_VERSION 12 /* require at least this fw version */ =20 #define HPA_POWER_BUTTON (FIRMWARE_END - 0x10) @@ -683,6 +690,22 @@ static void hppa_nmi(NMIState *n, int cpu_index, Error= **errp) } } =20 +static void hppa_machine_common_class_init(ObjectClass *oc, const void *da= ta) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + NMIClass *nc =3D NMI_CLASS(oc); + + mc->reset =3D hppa_machine_reset; + mc->block_default_type =3D IF_SCSI; + mc->default_cpus =3D 1; + mc->max_cpus =3D HPPA_MAX_CPUS; + mc->default_boot_order =3D "cd"; + mc->default_ram_id =3D "ram"; + mc->default_nic =3D "tulip"; + + nc->nmi_monitor_handler =3D hppa_nmi; +} + static void HP_B160L_machine_init_class_init(ObjectClass *oc, const void *= data) { static const char * const valid_cpu_types[] =3D { @@ -690,23 +713,13 @@ static void HP_B160L_machine_init_class_init(ObjectCl= ass *oc, const void *data) NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); - NMIClass *nc =3D NMI_CLASS(oc); =20 mc->desc =3D "HP B160L workstation"; mc->default_cpu_type =3D TYPE_HPPA_CPU; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_B160L_init; - mc->reset =3D hppa_machine_reset; - mc->block_default_type =3D IF_SCSI; - mc->max_cpus =3D HPPA_MAX_CPUS; - mc->default_cpus =3D 1; mc->is_default =3D true; mc->default_ram_size =3D 512 * MiB; - mc->default_boot_order =3D "cd"; - mc->default_ram_id =3D "ram"; - mc->default_nic =3D "tulip"; - - nc->nmi_monitor_handler =3D hppa_nmi; } =20 static void HP_C3700_machine_init_class_init(ObjectClass *oc, const void *= data) @@ -716,42 +729,34 @@ static void HP_C3700_machine_init_class_init(ObjectCl= ass *oc, const void *data) NULL }; MachineClass *mc =3D MACHINE_CLASS(oc); - NMIClass *nc =3D NMI_CLASS(oc); =20 mc->desc =3D "HP C3700 workstation"; mc->default_cpu_type =3D TYPE_HPPA64_CPU; mc->valid_cpu_types =3D valid_cpu_types; mc->init =3D machine_HP_C3700_init; - mc->reset =3D hppa_machine_reset; - mc->block_default_type =3D IF_SCSI; mc->max_cpus =3D HPPA_MAX_CPUS; - mc->default_cpus =3D 1; - mc->is_default =3D false; mc->default_ram_size =3D 1024 * MiB; - mc->default_boot_order =3D "cd"; - mc->default_ram_id =3D "ram"; - mc->default_nic =3D "tulip"; - - nc->nmi_monitor_handler =3D hppa_nmi; } =20 static const TypeInfo hppa_machine_types[] =3D { { - .name =3D MACHINE_TYPE_NAME("B160L"), - .parent =3D TYPE_MACHINE, - .class_init =3D HP_B160L_machine_init_class_init, + .name =3D TYPE_HPPA_COMMON_MACHINE, + .parent =3D TYPE_MACHINE, + .instance_size =3D sizeof(HppaMachineState), + .class_init =3D hppa_machine_common_class_init, + .abstract =3D true, .interfaces =3D (const InterfaceInfo[]) { { TYPE_NMI }, { } }, + }, { + .name =3D MACHINE_TYPE_NAME("B160L"), + .parent =3D TYPE_HPPA_COMMON_MACHINE, + .class_init =3D HP_B160L_machine_init_class_init, }, { .name =3D MACHINE_TYPE_NAME("C3700"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_HPPA_COMMON_MACHINE, .class_init =3D HP_C3700_machine_init_class_init, - .interfaces =3D (const InterfaceInfo[]) { - { TYPE_NMI }, - { } - }, }, }; =20 --=20 2.51.0 From nobody Fri Nov 14 18:17:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760077226; cv=none; d=zohomail.com; s=zohoarc; b=cHgBYS1UhrF3OzJTWUNo1EOGPsOTknuh0AxouUdj8mRWsmu+KRrqJ7Ek/RbnNZIlTdjX9tgRhLMZm9K0fbWfF+yGj5SW5/T6QjQWav+WDQlneFZhMegQTi64pd1VqWvz9x4VdXJ62PdMFo/o1doWHrdDJDh9gmGcxB3RYrVqddw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760077226; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dalgO3KHFqrnvpaTZLuwmPIln6ESJ7EOm1cXEsir9nA=; b=QFmj/6UKODZl4sv5tPhtCwpY6JyQP0vhLvQn8yzLJeOEmMnJgJXYLXenE8g6gWdUQJYxvY8hiwWgsKfEKC4p0z7uBzV1SN7iRvNqIt0XL6YnrFQjKh4wjrOHkNRmm4BfWSqJcsDiYndZxjl4CBQ6kl0blS8nCqGh5qme3hGwG4g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760077226552896.7992971000938; Thu, 9 Oct 2025 23:20:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v76T4-0001hz-1J; Fri, 10 Oct 2025 02:19:06 -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 1v76Sx-0001dE-E1 for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:18:59 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v76Sv-0001Gs-FI for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:18:59 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-46e52279279so11406545e9.3 for ; Thu, 09 Oct 2025 23:18:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fab656554sm52308755e9.11.2025.10.09.23.18.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 23:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760077132; x=1760681932; 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=dalgO3KHFqrnvpaTZLuwmPIln6ESJ7EOm1cXEsir9nA=; b=gHDX0udBq3kOtuP3Fi2iBDUKpkVsS49PqR+aXGUNQSZhHtoGUVC4DxNZ3OICGfoQ77 4Ry49ex/cHDpj8TrKQEzmEenNUcTg0ebShTH7xENmxFFpKq8G7gNSeRhZbPAwHCAGYka F0Pla88MUABLyD7ejgGUWzEKWwoJjd2XTmEhgjGsoUVK2La15XDLFdCUTwCQRu4dddeu OwAhbAHSy7i97OPlEUDsrDjWyD8eZ6xFMh2lUoo0qOEnw9J4+o+GGNC4XOXudrUDN1Ww phZccRcp+pYsf88z1mqbBo0M7fJLs+6EXc7Jh3TOTqzPSu4SCoG8qSmvCJDqw60+/66b 1+7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760077132; x=1760681932; 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=dalgO3KHFqrnvpaTZLuwmPIln6ESJ7EOm1cXEsir9nA=; b=Mk7xIMRrc/UqVtoSjDSFE82iQ3/+23tTzndN0elZSfcyZ+JKccYNDJowJkxvZjSal1 IvPUpPJf2E44sxxHj4ofPW/o5LL72e2oh9blTu1HW/xCRGL+l4ZdIptQiY0i3jKW7aXG Kt35jqv4wJl/U1lSjK6WEd8kZqF+5M5OQSsywmYreIrSDYHQtEYfHAoGgXN2w08Xg6mP MgKg2Zr2flgCOch7asEvtFmr+Qw2idyfqE6mefEgDLnXu6U8N5qNy2cvISHOaLChA0Kx xW+/Slpo1qQjzVVJXHtk3bAm9k6iHprELyKHfENSUS2mdHgUjZVYzxYQbLqljteqX6X4 pGQw== X-Gm-Message-State: AOJu0YzWIq9f7eq0gyKX3zpmAemCou697yPp0dIGTJgRDvdUUvdkcIz+ YCGbpRA6rwu2CK5YsBA3RzlK3sxmhtwOis5bFYAelw2tkN6HVlIkSMQ5p6jvWHMemTsK09BFoZv jqAhdDfIjPg== X-Gm-Gg: ASbGncvzovmQI25Ctr6VgwX8NhPiQj8HK/biKEk2s+vjbW8poQWDDHpBAqy+Ne9K1VS pPkmHnPu7Z0fiP7axUTSPrLMFeiFMy0NL091guWkHpL4q72qN1byV02amftFeXTV07sUJM5JtY9 9rJn9MywlkGMxikbkD/TxlLKJTj+Rf3V6XJa7K1RKIajO7Nk4Unz9o8E2wsQx6XWi0iZzm5kPQ7 JwvCVodgDJQPx44qPFLhRkHWE5twRz0GgxBqV+PwCuRmCGKsUgiANzZGJI5zngadi02JwwI02RH kpmPQfGwRS/2HsDfB2yxFXAoWt4Me0sjsG2p1NnteA4C/3pq84PFXml/pH5Ypwml1p9rtQU0xrs wNEPtTYcsonYu51zwJaW3/ifKVO8VYMUDLodXtbNzXZwCKze4Fp3kAGTnwY2XNZVGdSvuQpOr0g ET6y+qn1y+Jj2V04YLW+yIthmA X-Google-Smtp-Source: AGHT+IHGNjSsTetU0n+zcIobLZI9qBpTbbsvK+IyPUH1hYMF0B6AXNnLm0/+tJzbgPUeBxsk+6P/QA== X-Received: by 2002:a05:600c:529a:b0:46e:59bb:63cf with SMTP id 5b1f17b1804b1-46fa9af31d9mr70520085e9.24.1760077132318; Thu, 09 Oct 2025 23:18:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Helge Deller , Anton Johansson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/6] hw/hppa: Reduce variables scope in common_init() Date: Fri, 10 Oct 2025 08:18:33 +0200 Message-ID: <20251010061836.45739-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251010061836.45739-1-philmd@linaro.org> References: <20251010061836.45739-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760077228620116600 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/hppa/machine.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index c8da159a114..cddca69b938 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -352,16 +352,11 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus, TranslateFn *translate) { const char *kernel_filename =3D machine->kernel_filename; - const char *kernel_cmdline =3D machine->kernel_cmdline; - const char *initrd_filename =3D machine->initrd_filename; - const char *firmware =3D machine->firmware; MachineClass *mc =3D MACHINE_GET_CLASS(machine); DeviceState *dev; PCIDevice *pci_dev; - char *firmware_filename; - uint64_t firmware_low, firmware_high; long size; - uint64_t kernel_entry =3D 0, kernel_low, kernel_high; + uint64_t kernel_entry =3D 0; MemoryRegion *addr_space =3D get_system_memory(); MemoryRegion *rom_region; SysBusDevice *s; @@ -431,6 +426,10 @@ static void machine_HP_common_init_tail(MachineState *= machine, PCIBus *pci_bus, firmware on 64-bit machines by default if not specified on command line. */ if (!qtest_enabled()) { + const char *firmware =3D machine->firmware; + uint64_t firmware_low, firmware_high; + char *firmware_filename; + if (!firmware) { firmware =3D lasi_dev ? "hppa-firmware.img" : "hppa-firmware64= .img"; } @@ -467,6 +466,10 @@ static void machine_HP_common_init_tail(MachineState *= machine, PCIBus *pci_bus, =20 /* Load kernel */ if (kernel_filename) { + const char *kernel_cmdline =3D machine->kernel_cmdline; + const char *initrd_filename =3D machine->initrd_filename; + uint64_t kernel_low, kernel_high; + size =3D load_elf(kernel_filename, NULL, linux_kernel_virt_to_phys, NULL, &kernel_entry, &kernel_low, &kernel_high, NU= LL, ELFDATA2MSB, EM_PARISC, 0, 0); --=20 2.51.0 From nobody Fri Nov 14 18:17:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760077205; cv=none; d=zohomail.com; s=zohoarc; b=X3C5MzwNR8PIiFunYPeCutmkvTWXB6uqqMlgEhx5i7Ws+3fGLjdcBk91S72iIDxXIbmLdOCSIuYZ3avWlQn3G7qrDMYQ6HPK3vuElmXKFJ/E6QlJUZ99ZXMZPuvPrSH8Fuj1QK1pK9Lp5dV9RSfNMc/wM7hxzAhnE8g6RXRj+kE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760077205; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=74/Rvt9xzTS9fCSsduCNSLfQP+B5/7nDG11bj0TrU+M=; b=Xkn3sf7W6d97rVms+/lTaxv4m22cDYlVRIbVxtE7RyqwfRvvm0peAxMQwBwUGOqO6xlCc5jV4hsteAeiM0lZ4fJQiGW7RfxTmmT3Nmk7qTcZdKcsQlywUrIqy0emu0MeDqG37uQZSWH9taikx/72DmzuveydobQIphR3UzPSxJg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760077205259930.3124874196523; Thu, 9 Oct 2025 23:20:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v76T4-0001jA-O5; Fri, 10 Oct 2025 02:19:06 -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 1v76T2-0001h0-AQ for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:19:04 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v76Sz-0001HJ-Oy for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:19:03 -0400 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-46e6c8bc46eso9721875e9.3 for ; Thu, 09 Oct 2025 23:18:59 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb4989601sm27999805e9.9.2025.10.09.23.18.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 23:18:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760077137; x=1760681937; 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=74/Rvt9xzTS9fCSsduCNSLfQP+B5/7nDG11bj0TrU+M=; b=a1iAUAgOhu+0ixKtLrUhpmPznQz+bRidXlnvAsRqaUS9UAnYHw5+hlXvoFe7L2cJWx ZfVVEP4JImENrFA4EfOqJSeFQQLQi3huMiLp4oyim398Bz0gKqSLssgSAVkEa0Oh5KjV h/x0bEFTgAnMLJTRpa7JblmBypSsMhI/ziVFbK/SICz6lSN+mx3lAOo9Bb0yLgX0Oj+p M9JcfdZas0YyEL87GHxRXSOJH+cIxTyyk/ivlRjIrSc6tY5T78u9HN7nl9qwCuAFtSEz kQh+RpcyMAlZgUEYRlB8O3WDr5gQtsTcyyqqmZk2L+A0bTu/AANNmjMu2sLssguir5aX +PvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760077137; x=1760681937; 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=74/Rvt9xzTS9fCSsduCNSLfQP+B5/7nDG11bj0TrU+M=; b=jyZFAj29nd0pPJe4c+D7pK9EuM22XDqvkJtIhPBWxutfuwmQi0tMPInYybuRp6pd2g Nr7g2hPxU5+0ZAcxWC+iCLr6Mb6Yh/J4SWI7O/kalGzyCfd5rhQKJFFB5k31HN42Sz/Y WxqqeRfFloafDmy9YVCr0uUltB92nG9HcYhYuR8IdW+SGPZ0sSVPPCAl+Wa4Dtb4rsx1 9p9anzJcnX15hCwa/RBWPUeb0RC5mAePaESDyH1Q4c51G2YMYsHhh4dSKGa47LgP2+Oy 26DgI75hjNTgLczqcg8BF1hqCO+dJkJHN6NqFeqDybAEplF8bzizEHFKmt0XFpHYxUtG vITw== X-Gm-Message-State: AOJu0YzbbaE5uo8JsjdSgMubULunZ4KxWDbY5KyOwYS8VhObUgIq7kgv e54WvUjPKlPdnfAu5CUxBA1zBD0MWJaglynnH7QbU7GEl5xZfanSONhuFl6WTPpP47qouDLGRJb z/3wGjeFst0MA X-Gm-Gg: ASbGncv4UHFKt/khuZ10K37fHAeBBphloD1YjhYhCfKkChc+JV2eFNqHM0AyVdfk4T1 ruTWaj151wC+ffm2yESrNVl9bs3N5G8rJydgTDHg1BW6s6nJ7Rd0XE6MkM4LrVy6mTD09S1k1/d 1SS2WbjzPw564nt9AT0cAsWFMWKwNVrTErYq1BTmwdUT2yKvFI5L7lWo5CxduLrlvvwFKgxtYr4 9eksslMHY93Q0uQm5DTsKmh7pU9Nw8ek8kzfPNhahF8gQ1KVV319//elRwfxiWmtuuujwUVKQXG CgCNWXJ8dsW9HzHZY7lv/CWnpRTmqlYs1f83EpjDtN/4kp7n9htyrVVUfGyctAMNGvPX6kNSogC bORfdps1mlUNkPJflN9cqipnx3iR/Reuow9jdMDVihKP2Hml55HY8DHX5RAn2jfCIY93vMW9SMs iHpiOkfyn6+ZyPmYhQugmXGCzS X-Google-Smtp-Source: AGHT+IHbUXpWdQ/Sl4NeVsEe2ZoNLivsjOsukVXkPfl+2FWwOGiq6nhJUHxhxdgcY2XaTGRTrSZTKg== X-Received: by 2002:a05:600c:46c7:b0:46e:36f2:2a62 with SMTP id 5b1f17b1804b1-46fa9b08c22mr67037975e9.27.1760077137084; Thu, 09 Oct 2025 23:18:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Helge Deller , Anton Johansson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/6] hw/hppa: Move CPU::kernel_entry -> Machine::boot_info.gr25 Date: Fri, 10 Oct 2025 08:18:34 +0200 Message-ID: <20251010061836.45739-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251010061836.45739-1-philmd@linaro.org> References: <20251010061836.45739-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philmd@linaro.org; helo=mail-wm1-x343.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=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760077210873116600 Current code uses CPUHPPAState::@kernel_entry to hold either: - kernel entry virtual address - firmware interactive mode and CPUHPPAState::@cmdline_or_bootorder to either: - kernel &cmdline physical address - firmware boot order Besides, these variables don't belong to CPUHPPAState, they depend on how the machine is started, and only apply to the first CPU. The MachineReset handler initialize some registers of the first CPU. Hold these register reset values in the MachineState, initializing them once in machine_HP_common_init_tail(). Start by addressing the kernel entry and firmware interactive mode values, stored in $GP25. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/hppa/cpu.h | 1 - hw/hppa/machine.c | 28 ++++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index e14f238827b..f54634db7f1 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -272,7 +272,6 @@ typedef struct CPUArchState { =20 bool is_pa20; =20 - target_ulong kernel_entry; /* Linux kernel was loaded here */ target_ulong cmdline_or_bootorder; target_ulong initrd_base, initrd_end; } CPUHPPAState; diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index cddca69b938..7066f6d575c 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -41,6 +41,10 @@ OBJECT_DECLARE_SIMPLE_TYPE(HppaMachineState, HPPA_COMMON= _MACHINE) =20 struct HppaMachineState { MachineState parent_obj; + + struct { + uint64_t gr25; + } boot_info; }; =20 #define MIN_SEABIOS_HPPA_VERSION 12 /* require at least this fw version */ @@ -353,10 +357,10 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus, { const char *kernel_filename =3D machine->kernel_filename; MachineClass *mc =3D MACHINE_GET_CLASS(machine); + HppaMachineState *hms =3D HPPA_COMMON_MACHINE(machine); DeviceState *dev; PCIDevice *pci_dev; long size; - uint64_t kernel_entry =3D 0; MemoryRegion *addr_space =3D get_system_memory(); MemoryRegion *rom_region; SysBusDevice *s; @@ -468,7 +472,7 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, if (kernel_filename) { const char *kernel_cmdline =3D machine->kernel_cmdline; const char *initrd_filename =3D machine->initrd_filename; - uint64_t kernel_low, kernel_high; + uint64_t kernel_entry, kernel_low, kernel_high; =20 size =3D load_elf(kernel_filename, NULL, linux_kernel_virt_to_phys, NULL, &kernel_entry, &kernel_low, &kernel_high, NU= LL, @@ -484,6 +488,8 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 ", size %" PRIu64 " kB\n", kernel_low, kernel_high, kernel_entry, size / KiB); + /* Keep initial kernel_entry for first boot */ + hms->boot_info.gr25 =3D kernel_entry; =20 if (kernel_cmdline) { cpu[0]->env.cmdline_or_bootorder =3D 0x4000; @@ -520,19 +526,16 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus, cpu[0]->env.initrd_base =3D initrd_base; cpu[0]->env.initrd_end =3D initrd_base + initrd_size; } - } - - if (!kernel_entry) { + } else { /* When booting via firmware, tell firmware if we want interactive - * mode (kernel_entry=3D1), and to boot from CD (cmdline_or_bootor= der=3D'd') + * mode (interactive_mode=3D1), and to boot from CD (cmdline_or_bo= otorder=3D'd') * or hard disc (cmdline_or_bootorder=3D'c'). */ - kernel_entry =3D machine->boot_config.has_menu ? machine->boot_con= fig.menu : 0; + hms->boot_info.gr25 =3D machine->boot_config.has_menu + ? machine->boot_config.menu + : 0; cpu[0]->env.cmdline_or_bootorder =3D machine->boot_config.order[0]; } - - /* Keep initial kernel_entry for first boot */ - cpu[0]->env.kernel_entry =3D kernel_entry; } =20 /* @@ -650,6 +653,7 @@ static void machine_HP_C3700_init(MachineState *machine) =20 static void hppa_machine_reset(MachineState *ms, ResetType type) { + HppaMachineState *hms =3D HPPA_COMMON_MACHINE(ms); unsigned int smp_cpus =3D ms->smp.cpus; int i; =20 @@ -670,7 +674,7 @@ static void hppa_machine_reset(MachineState *ms, ResetT= ype type) } =20 cpu[0]->env.gr[26] =3D ms->ram_size; - cpu[0]->env.gr[25] =3D cpu[0]->env.kernel_entry; + cpu[0]->env.gr[25] =3D hms->boot_info.gr25; cpu[0]->env.gr[24] =3D cpu[0]->env.cmdline_or_bootorder; cpu[0]->env.gr[23] =3D cpu[0]->env.initrd_base; cpu[0]->env.gr[22] =3D cpu[0]->env.initrd_end; @@ -678,7 +682,7 @@ static void hppa_machine_reset(MachineState *ms, ResetT= ype type) cpu[0]->env.gr[19] =3D FW_CFG_IO_BASE; =20 /* reset static fields to avoid starting Linux kernel & initrd on rebo= ot */ - cpu[0]->env.kernel_entry =3D 0; + memset(&hms->boot_info, 0, sizeof(hms->boot_info)); cpu[0]->env.initrd_base =3D 0; cpu[0]->env.initrd_end =3D 0; cpu[0]->env.cmdline_or_bootorder =3D 'c'; --=20 2.51.0 From nobody Fri Nov 14 18:17:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760077202; cv=none; d=zohomail.com; s=zohoarc; b=atmUMsoglTt0Sw2JF3FOEGrnjKX0vypbLBrsVLjnVRSDRsxZJoQkLn8F9Z0PnUfjyFQZRxqKSkLXHRZQWQdMoZ1w98xA57CG2WztWuTNOZoEvmabj65+b8NNlvQ5CA5SElPePV4CFnG6VTYnZMpKvV1fWs6ghQZ42sMCERgVm9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760077202; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bVqaOgMWNzPQ72Xk8r5FC1qOKhB0mUP3ugx2Q83BZeI=; b=NlPK0KTECA8j37T9Ej/ohQJJhTYmsWW41PVIN3IQgnSmqezsxSxoaYNAB6BXT6tPySKwXfZg2Q1ZZmc7GY1YZ2zjkuwqhJUrsFLmNbcqDycQy2YJk7L66duP+OSvyBpttBFGRhY88z9bhf6zllv06vV6a0GXx4ACeXzYZyia4wA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17600772020611015.6868411672464; Thu, 9 Oct 2025 23:20:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v76T9-0001m1-Th; Fri, 10 Oct 2025 02:19:11 -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 1v76T8-0001lR-Db for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:19:10 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v76T1-0001HX-Ua for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:19:10 -0400 Received: by mail-wm1-x343.google.com with SMTP id 5b1f17b1804b1-46b303f755aso13170435e9.1 for ; Thu, 09 Oct 2025 23:19:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb489194dsm30421395e9.12.2025.10.09.23.19.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 23:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760077142; x=1760681942; 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=bVqaOgMWNzPQ72Xk8r5FC1qOKhB0mUP3ugx2Q83BZeI=; b=oXiBUFywPGlAoBfhstq5vobRFG8n3jS7WPhR4F86YLHivxMdSsaPvutezFdzkR0jXA 8+t2cdmiPzpUT83DBJk4Td1Hn/BPKb1vExR5BygIZzznrqRSyMvqbYHyQKVUgxIz55+v Dk8f3p8KA8oq+T7je4bCs60wZZvcN1dnycKlnphgHyi2lfyDTFz8+jy/aTCrVocAKmmj 2Rjr+wauy+JHJLzT+JiR/QqeLi5PYmiRstVxQ/gm2UGXY770+nJD/xNc+MU+7GdvUAkm /1hwrnH19peHtCQ8rbC7qRR8H0LObwchPCF/XU+cI1zzNWBzQ8egGngRQ/wC08SBaXM8 XwAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760077142; x=1760681942; 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=bVqaOgMWNzPQ72Xk8r5FC1qOKhB0mUP3ugx2Q83BZeI=; b=JV18y9xTwFBjFLtHLpYPSqdwWAqwwFxhHRAOmCSy8WkRGykaf+avsC35Dyes97zhXM 6VJthC6hMqHYqSc2MR2ujhGKv0AEDRvoKT7fya47qc+iMCr/aaH6pN3PpL2z8Imqi/bL K03PPaWu4tcf4y2euoy6pWiuMQfPB2KplBHopdO/pfu5bgGU53B5Kuu+s1AhoKoXkDc5 MwpwaQZRa31KtX0AkyZ82nSMoTqhz2P2IQczoVeeNgjbfTBrbVPocCRYTRjh3QLcHCF8 /MRmaEH8KsZb15pvRfA2G9n4YP9V77A3jDdjLIB5MjKqQr+b5pUhdqfNwUhwKCM6E0S/ /3kw== X-Gm-Message-State: AOJu0YzH4y7zyxSVCbCeuzVyF9dvXuQ2ZuQCJOf36u9q4VkjNX1PQ5y8 xm8HmFrjvAR9mW3Beh160Y9UCEGy9Z+XYjtzhkqe3Yx8vv0bQyoOubeWYmkwEH7X8NKwQgqjnuA GLrmaP25FlyGt X-Gm-Gg: ASbGnctIVQW957hYCXq5WQLgzkJvVhqMRAAJNaMjLjFqHpqfthBff4RKprGJRJ6WGGB ffeTZ6XQ8e91X7J/ZdqDFG9M8od+yvG2C690uiAnTRHDiaAvdfVvG1VLhCAlstjxBQD7KzngGBj J9Vvw6iJQDG1a2SpqJ6nO9B0nxC8LcLsiqxVIe+fzmColQ4C1DxmG9AeKxW18t5/mM2D/1Jt4qq Ld1iduXw+77HL5DZcNBLlvgxEHOwlu5c/10sdcjda+JspE62SGAqQvvFQFvSXdJlaKa7gb62VLy 1yZUMvyMvS1VNMUe3mKe2feF0q3ATVN9Z7ypC8P8FALxtIePFz3v0MfXPRlZBi/aRDebcwOzGDB JvtayyLi43Hm+Lkt0Z/vdXkojYl5FW1LFOJUW9a1J69rsTi5OlztFowGNx+wz0O3XASJmqgCuxv 5TVdrHt8AVlAarQZcOoqkzWQU0 X-Google-Smtp-Source: AGHT+IHPiCYllZmN+Ue5R2/Xetr9YVQVRsuvluIfpH34oyRCZokvL1DKroCcEJg18/hTRSEhesZtgA== X-Received: by 2002:a05:600c:c083:b0:46f:b32e:5292 with SMTP id 5b1f17b1804b1-46fb32e5338mr21753845e9.8.1760077141881; Thu, 09 Oct 2025 23:19:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Helge Deller , Anton Johansson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/6] hw/hppa: Move CPU::cmdline_or_bootorder -> Machine::boot_info.gr24 Date: Fri, 10 Oct 2025 08:18:35 +0200 Message-ID: <20251010061836.45739-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251010061836.45739-1-philmd@linaro.org> References: <20251010061836.45739-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philmd@linaro.org; helo=mail-wm1-x343.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=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760077204898154100 Current code uses CPUHPPAState::@cmdline_or_bootorder to hold either: - kernel &cmdline physical address - firmware boot order Besides, these variables don't belong to CPUHPPAState, they depend on how the machine is started, and only apply to the first CPU. Initialize the register value the reset handler needs ($GP24) once in machine_HP_common_init_tail(). Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/hppa/cpu.h | 1 - hw/hppa/machine.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index f54634db7f1..6c9bcbd9078 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -272,7 +272,6 @@ typedef struct CPUArchState { =20 bool is_pa20; =20 - target_ulong cmdline_or_bootorder; target_ulong initrd_base, initrd_end; } CPUHPPAState; =20 diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 7066f6d575c..b6f15bc61a3 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -43,6 +43,7 @@ struct HppaMachineState { MachineState parent_obj; =20 struct { + uint64_t gr24; uint64_t gr25; } boot_info; }; @@ -492,8 +493,8 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, hms->boot_info.gr25 =3D kernel_entry; =20 if (kernel_cmdline) { - cpu[0]->env.cmdline_or_bootorder =3D 0x4000; - pstrcpy_targphys("cmdline", cpu[0]->env.cmdline_or_bootorder, + hms->boot_info.gr24 =3D 0x4000; + pstrcpy_targphys("cmdline", hms->boot_info.gr24, TARGET_PAGE_SIZE, kernel_cmdline); } =20 @@ -528,13 +529,13 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus, } } else { /* When booting via firmware, tell firmware if we want interactive - * mode (interactive_mode=3D1), and to boot from CD (cmdline_or_bo= otorder=3D'd') - * or hard disc (cmdline_or_bootorder=3D'c'). + * mode (interactive_mode=3D1), and to boot from CD (bootorder=3D'= d') + * or hard disc (bootorder=3D'c'). */ hms->boot_info.gr25 =3D machine->boot_config.has_menu ? machine->boot_config.menu : 0; - cpu[0]->env.cmdline_or_bootorder =3D machine->boot_config.order[0]; + hms->boot_info.gr24 =3D machine->boot_config.order[0]; } } =20 @@ -675,7 +676,7 @@ static void hppa_machine_reset(MachineState *ms, ResetT= ype type) =20 cpu[0]->env.gr[26] =3D ms->ram_size; cpu[0]->env.gr[25] =3D hms->boot_info.gr25; - cpu[0]->env.gr[24] =3D cpu[0]->env.cmdline_or_bootorder; + cpu[0]->env.gr[24] =3D hms->boot_info.gr24; cpu[0]->env.gr[23] =3D cpu[0]->env.initrd_base; cpu[0]->env.gr[22] =3D cpu[0]->env.initrd_end; cpu[0]->env.gr[21] =3D smp_cpus; @@ -685,7 +686,6 @@ static void hppa_machine_reset(MachineState *ms, ResetT= ype type) memset(&hms->boot_info, 0, sizeof(hms->boot_info)); cpu[0]->env.initrd_base =3D 0; cpu[0]->env.initrd_end =3D 0; - cpu[0]->env.cmdline_or_bootorder =3D 'c'; } =20 static void hppa_nmi(NMIState *n, int cpu_index, Error **errp) --=20 2.51.0 From nobody Fri Nov 14 18:17:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760077206; cv=none; d=zohomail.com; s=zohoarc; b=niJ8m99rwVN5XmJH25lmHbj8yUrdL7VJ3nqrOTHoDyiWnxBfRTICGUlD+URHG/8JFCRCE7Fu63jhI+x4Z2JfaFCBgrVQenTYJKn2OyVpLhvc15l5s7jcQaudDipcLNp8EPGx81Fx32VqgvWg3HWFUDdmlai5wF0sigxTfw0Txho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760077206; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LAwykyiOhWvraQUfGAzRC/31Dk7bosyxV0Cl5cE42l8=; b=UdgZGO/QKUJDywlLrHhd5YMQpKD1LNMKnE0OtKlttbnwEhupaO7AC02xZAlVikqLn/DcateBFm/CQ5zRw0m8ll8+QNZZaHCbXlajLn+wUaxMgNCEZpRA7kPDqkr5I/1j4d7Y4117CyPxgp3V0i+Y24RP5ape0zUBJIa9FMkZvl4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760077206133344.97549538804935; Thu, 9 Oct 2025 23:20:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v76TH-0001sq-Is; Fri, 10 Oct 2025 02:19:19 -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 1v76TE-0001ot-RT for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:19:16 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v76T7-0001Hi-3c for qemu-devel@nongnu.org; Fri, 10 Oct 2025 02:19:15 -0400 Received: by mail-wr1-x444.google.com with SMTP id ffacd0b85a97d-3f44000626bso1152664f8f.3 for ; Thu, 09 Oct 2025 23:19:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce5d0061sm2467769f8f.30.2025.10.09.23.19.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 23:19:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760077146; x=1760681946; 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=LAwykyiOhWvraQUfGAzRC/31Dk7bosyxV0Cl5cE42l8=; b=Kks0ZQG0FnQ3YDuuDtTw0smA/O38yLwLsOsimoOKNqyLde//VPMuvyYfdoW1rR5aWT rlumwnMzLdbDp4sCET+4SUZ2EmKMT6bvZeewK8egZ/msbbyCCEHe5m4+n1jc11a7PTxQ zy50BQJIjoV0BL5cmBShZPIeomxm9P9SBkoBbtkdzV2jb4YJVjMQsUu6ofFor86F86+d +gzmWxmjGKBZIDEm1h7xYMRaBMgwoHEpQjoqWKFijt0LHiegwR7Hdq2tjq+u32eCN1wK Z3epDH44Y7zahJ7sOTwYmwIBzUBUgRx6KsGw/sURPCHRrtoIakxxnFH3Yw+JekSb3LEg zxfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760077146; x=1760681946; 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=LAwykyiOhWvraQUfGAzRC/31Dk7bosyxV0Cl5cE42l8=; b=Z1jYw3AZjVy+nrpEkRvP+N2lHg1BkiX1O0z917rr/9AEi2oS9VI5H/h/6V5XjTAhXP m9iCzNV1LB6rTJlSuDzXh/nSysjM9QVJ8EclC/bOGcj0luDdEd4GUSaOttRlPaa1U/j4 8OO3LWcJb7zLW587P7TN/IQGWF2dQJuZZeVdivTiuT6zGQH4VAIn6LsD92cjq63gF/o4 daYgX5ixSE8nQW5CSA5fltkhi2Oti31Tqnn4dDwEcoTx6twaUR4YTtr6irvIf/7tS1U7 Ew6nGugVXsDU53c5mg8KHvgL7GKEa5PKiVyQs1oHDBnGFMz/A7Yg8WdhG6P6moLzYXHA /laA== X-Gm-Message-State: AOJu0Yz3U2DJMphXlvw72dJ3iBPkG3x+IAbMgFTfq4zfhbCmxILr871U 8Scp+PpQcF0SQoSxm3MgLymDv2QKGN2yMvK/+qP1tnOgp/hI4XhOQDtVbHRM43kC186GqTNTPtJ KPtbMU531pqv+ X-Gm-Gg: ASbGncugUso0tcanVNaEdJ5pNnGf+QfXJwEN4gyRhmSaaPhPzcSOmmBvvwZQX3HyAsk DsGRHGKFG4QBWXko0uKAkZAq+1lnwJNcvaNzyZr8UsZThGsCzbpli6GxXIb055EqdTt9kBj0/G6 GpNme7tcWV9sMSVomhrEey/N9NcXPOyevHKWy9gWeA3axAp1Nk+v+was2MDrb/go4XlxXkXfoNr ZgcBUxyoI16WJ85pydV8uocwXWaGDF74JL13yN2zixY+wcCi/ug5k48HIuqnJwlypVifhYOF/bj nhMoqy2fAHnfLpCcGgzRNzQSlfDR9YOl6ijo7V+vHOAdjVsMpPqZGbOJQrNk0cWWOvrjFjV2bX3 471xWlV3k750mentgfh4Gs4Cnp+tTaIR+fV+b0Bi+m2r4/bWlpw/XZsVFhRP5dpCJKNQCamCuEJ rYxfYFCvgMSnn/TvM2ogbPsR1y X-Google-Smtp-Source: AGHT+IEaw23SIuDD/mzjx6TQeY5zR86M5FBQRYkThiq/qbgV/Kw0MK7QSN5wnJdmOxtYtaDb6jyqJw== X-Received: by 2002:a05:6000:2f83:b0:3e4:f194:2886 with SMTP id ffacd0b85a97d-426670835d8mr5901053f8f.19.1760077146460; Thu, 09 Oct 2025 23:19:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Helge Deller , Anton Johansson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/6] hw/hppa: Move CPU::initrd_base/end -> Machine::boot_info.gr22/23 Date: Fri, 10 Oct 2025 08:18:36 +0200 Message-ID: <20251010061836.45739-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251010061836.45739-1-philmd@linaro.org> References: <20251010061836.45739-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=philmd@linaro.org; helo=mail-wr1-x444.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760077210785116600 These variables don't belong to CPUHPPAState, they depend on how the machine is started, and only apply to the first CPU. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/hppa/cpu.h | 2 -- hw/hppa/machine.c | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 6c9bcbd9078..49d0243f677 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -271,8 +271,6 @@ typedef struct CPUArchState { struct {} end_reset_fields; =20 bool is_pa20; - - target_ulong initrd_base, initrd_end; } CPUHPPAState; =20 /** diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index b6f15bc61a3..61e83daaadb 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -43,6 +43,8 @@ struct HppaMachineState { MachineState parent_obj; =20 struct { + uint64_t gr22; + uint64_t gr23; uint64_t gr24; uint64_t gr25; } boot_info; @@ -524,8 +526,8 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, } =20 load_image_targphys(initrd_filename, initrd_base, initrd_size); - cpu[0]->env.initrd_base =3D initrd_base; - cpu[0]->env.initrd_end =3D initrd_base + initrd_size; + hms->boot_info.gr23 =3D initrd_base; + hms->boot_info.gr22 =3D initrd_base + initrd_size; } } else { /* When booting via firmware, tell firmware if we want interactive @@ -677,15 +679,13 @@ static void hppa_machine_reset(MachineState *ms, Rese= tType type) cpu[0]->env.gr[26] =3D ms->ram_size; cpu[0]->env.gr[25] =3D hms->boot_info.gr25; cpu[0]->env.gr[24] =3D hms->boot_info.gr24; - cpu[0]->env.gr[23] =3D cpu[0]->env.initrd_base; - cpu[0]->env.gr[22] =3D cpu[0]->env.initrd_end; + cpu[0]->env.gr[23] =3D hms->boot_info.gr23; + cpu[0]->env.gr[22] =3D hms->boot_info.gr22; cpu[0]->env.gr[21] =3D smp_cpus; cpu[0]->env.gr[19] =3D FW_CFG_IO_BASE; =20 /* reset static fields to avoid starting Linux kernel & initrd on rebo= ot */ memset(&hms->boot_info, 0, sizeof(hms->boot_info)); - cpu[0]->env.initrd_base =3D 0; - cpu[0]->env.initrd_end =3D 0; } =20 static void hppa_nmi(NMIState *n, int cpu_index, Error **errp) --=20 2.51.0