From nobody Tue Feb 10 14:32:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1619981715; cv=none; d=zohomail.com; s=zohoarc; b=Qi/yYJAseRCSNUtHGxRYyQsnfFfnMqPyX20HhU6v2q6VUcJRUeeKgzufH+PQrPCCff1mrTV0BMGMjJGiHzpSL4rZV+xTXUfSrAH789nyxg0N+HAvrFwnVHrklqwgfUpXH49qVLI4rtoYViUxfSCc5fAP70/9RUR0WJ1gVB+as+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619981715; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uY3UykazvXB5u3WZ3k3UwS05J5/ZA03gCfl0GB/ty3c=; b=W65h6ZfrXpiNrDGIAMV8ANnj21VF+qnMVg+OqHAkAC2HgzsADxmyKYWaXN/l2YqZcv/e3PI0SVLJbQaEAwFiTE4TLgN+Mc3NL3NMVF90aDr7GrbLbQYoqUU/srPxN0chyExQJpkwhI16cy9S0r6NyZ1uXJpFwxXTH8kq/LwtDhE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1619981715216373.087590326556; Sun, 2 May 2021 11:55:15 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id d4so3329210wru.7 for ; Sun, 02 May 2021 11:55:14 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id h13sm4962088wml.26.2021.05.02.11.55.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 11:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uY3UykazvXB5u3WZ3k3UwS05J5/ZA03gCfl0GB/ty3c=; b=ZtUMXNG78Va7oUSxqkr3y70eTqK/VEntI9TvY1GwVZmLJuj1xAwHkZbSwr7fU/y3lm 3i8U9p1IvE+pWK8z+8l+IhSggmXn+UOHKGlfiHn+KG8jIY76g2+0RjSBmM9sUIPNyxUc k+F93jB9ZJRLUvMzn2REUX4FpzAg3Z1xXsRbSQmOBQeivI2NdPic9BpOKjWLRilYTFGk PchuADCS+pegPrr/cXjPfzBv7YO9KnRAgOxFoYtajvvfHGKpP4Xn7yFj6avg9Jx2JE6+ XKP921BwAJLUh2twHCX14NxJLKMZqAOZf5xcX0QW4NBAwyghV9rTCYZQk/mnE9ufjMk9 7ShQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uY3UykazvXB5u3WZ3k3UwS05J5/ZA03gCfl0GB/ty3c=; b=RuNzy5MR2NG8umIRxBxABjMLh2irgUSP5V0dveeQqS+oTQJDhfW5ysX5/hJ5hJSRp9 69SqZ3LiGeVonh76RqYErK3lr1XgOhIKHoPjHraCfxKl+bHA2qS7xKmp9Tz/tu+Lz4aT voq2y58T5foRcXltGXRrRWJtddHbYDyZtg4Kkw3J0aPDt2VHdI5hwIoulGotZHjMhICl 6y+ATQW8JL2jWz2F7onpgFyZY5GGhPfbvKFqREQ55ifRZwDfXJ10yW/3/k/QgNwA3NPQ jo0m4eVEnmZ4gDp67EyL+7+YVL3WutFUb75cXwhVaAXIS3JxyCRxZVpEQWiyGl5qcwm4 Ihig== X-Gm-Message-State: AOAM530IaHjVWDW5tIRTNWZe/RxUjV2gu2xh/cedtSHQoCILwJd7eMf7 lV6BLYcHR47iWYkePtnlxxQ= X-Google-Smtp-Source: ABdhPJzH9Z5cRKlyrzu6oDhxbRN+DeQ1UcrulmnhjNA4E8gdahvO3pf0iNDTVRhpxWq8shNZNBADFQ== X-Received: by 2002:adf:cc8c:: with SMTP id p12mr16391782wrj.407.1619981713441; Sun, 02 May 2021 11:55:13 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Artyom Tarasenko , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/6] hw/sparc/sun4m: Move each sun4m_hwdef definition in its class_init Date: Sun, 2 May 2021 20:54:41 +0200 Message-Id: <20210502185441.599980-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210502185441.599980-1-f4bug@amsat.org> References: <20210502185441.599980-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Remove the sun4m_hwdefs[] array by moving assigning the structure fields directly in each machine class_init() function. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/sun4m.c | 245 ++++++++++++++++++++++------------------------- 1 file changed, 112 insertions(+), 133 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 956216591b0..52eeb3ce2dd 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -1138,9 +1138,26 @@ enum { ss600mp_id, }; =20 -static const struct sun4m_hwdef sun4m_hwdefs[] =3D { - /* SS-5 */ - { +static void sun4m_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->init =3D sun4m_hw_init; + mc->block_default_type =3D IF_SCSI; + mc->default_boot_order =3D "c"; + mc->default_display =3D "tcx"; + mc->default_ram_id =3D "sun4m.ram"; +} + +static void ss5_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCstation 5"; + mc->is_default =3D true; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0x10000000, .iommu_pad_base =3D 0x10004000, .iommu_pad_len =3D 0x0fffb000, @@ -1165,9 +1182,18 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss5_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, - /* SS-10 */ - { + }; +} + +static void ss10_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCstation 10"; + mc->max_cpus =3D 4; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0xfe0000000ULL, .tcx_base =3D 0xe20000000ULL, .slavio_base =3D 0xff0000000ULL, @@ -1190,9 +1216,18 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss10_id, .iommu_version =3D 0x03000000, .max_mem =3D 0xf00000000ULL, - }, - /* SS-600MP */ - { + }; +} + +static void ss600mp_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCserver 600MP"; + mc->max_cpus =3D 4; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0xfe0000000ULL, .tcx_base =3D 0xe20000000ULL, .slavio_base =3D 0xff0000000ULL, @@ -1213,9 +1248,18 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss600mp_id, .iommu_version =3D 0x01000000, .max_mem =3D 0xf00000000ULL, - }, - /* SS-20 */ - { + }; +} + +static void ss20_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCstation 20"; + mc->max_cpus =3D 4; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0xfe0000000ULL, .tcx_base =3D 0xe20000000ULL, .slavio_base =3D 0xff0000000ULL, @@ -1254,9 +1298,17 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss20_id, .iommu_version =3D 0x13000000, .max_mem =3D 0xf00000000ULL, - }, - /* Voyager */ - { + }; +} + +static void voyager_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCstation Voyager"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0x10000000, .tcx_base =3D 0x50000000, .slavio_base =3D 0x70000000, @@ -1277,9 +1329,17 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D vger_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, - /* LX */ - { + }; +} + +static void ss_lx_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCstation LX"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0x10000000, .iommu_pad_base =3D 0x10004000, .iommu_pad_len =3D 0x0fffb000, @@ -1301,9 +1361,17 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D lx_id, .iommu_version =3D 0x04000000, .max_mem =3D 0x10000000, - }, - /* SS-4 */ - { + }; +} + +static void ss4_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCstation 4"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0x10000000, .tcx_base =3D 0x50000000, .cs_base =3D 0x6c000000, @@ -1325,9 +1393,17 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss4_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, - /* SPARCClassic */ - { + }; +} + +static void scls_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCClassic"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0x10000000, .tcx_base =3D 0x50000000, .slavio_base =3D 0x70000000, @@ -1348,9 +1424,17 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D scls_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, - /* SPARCbook */ - { + }; +} + +static void sbook_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + + mc->desc =3D "Sun4m platform, SPARCbook"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); + smc->hwdef =3D &(const struct sun4m_hwdef) { .iommu_base =3D 0x10000000, .tcx_base =3D 0x50000000, /* XXX */ .slavio_base =3D 0x70000000, @@ -1371,112 +1455,7 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D sbook_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, -}; - -static void sun4m_machine_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - - mc->init =3D sun4m_hw_init; - mc->block_default_type =3D IF_SCSI; - mc->default_boot_order =3D "c"; - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; -} - -static void ss5_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCstation 5"; - mc->is_default =3D true; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); - smc->hwdef =3D &sun4m_hwdefs[0]; -} - -static void ss10_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCstation 10"; - mc->max_cpus =3D 4; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); - smc->hwdef =3D &sun4m_hwdefs[1]; -} - -static void ss600mp_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCserver 600MP"; - mc->max_cpus =3D 4; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); - smc->hwdef =3D &sun4m_hwdefs[2]; -} - -static void ss20_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCstation 20"; - mc->max_cpus =3D 4; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); - smc->hwdef =3D &sun4m_hwdefs[3]; -} - -static void voyager_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCstation Voyager"; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); - smc->hwdef =3D &sun4m_hwdefs[4]; -} - -static void ss_lx_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCstation LX"; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); - smc->hwdef =3D &sun4m_hwdefs[5]; -} - -static void ss4_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCstation 4"; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); - smc->hwdef =3D &sun4m_hwdefs[6]; -} - -static void scls_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCClassic"; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); - smc->hwdef =3D &sun4m_hwdefs[7]; -} - -static void sbook_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); - - mc->desc =3D "Sun4m platform, SPARCbook"; - mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); - smc->hwdef =3D &sun4m_hwdefs[8]; + }; } =20 static const TypeInfo sun4m_machine_types[] =3D { --=20 2.26.3