From nobody Tue Feb 10 03:38:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620062018; cv=none; d=zohomail.com; s=zohoarc; b=Qc33SBTmGDi3IaVhxUfkaPlTKrc4jZHdlBR3FDY4nLgS4m3nryxoBl5EZXVTz/ch7FtEkLD5+MWH+IBYFaQZGYT7927/sS1d356j6MXIH7j6koKV0reFP6JcpOuxg+20LKGnKUpw3oD4sSyaY/qB8lqxyklZXdM4nRWK1xiEvdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620062018; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gDycxe8WIhEZVnSndKn65sM4fYtaRiCKpUhaU9eIkw4=; b=KJBy0PR2xJezUeJFNfo5paKiNcP0jv4bdjkYRp8TSxD5qbom6gsqSMguMREMit1MIEc+rzYDelGO7rj8Zm238BVIkOugeoX2OoLqr7LHnE2yJQZXrarc3nXVf0vAY1oWJr6wPBLVM7O4W/eckvTT1rwIaOMTCHOu0otxP2C0+ok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1620062018736818.408696617831; Mon, 3 May 2021 10:13:38 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id a4so6384105wrr.2 for ; Mon, 03 May 2021 10:13:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (anancy-651-1-208-144.w109-217.abo.wanadoo.fr. [109.217.237.144]) by smtp.gmail.com with ESMTPSA id n3sm208602wmi.7.2021.05.03.10.13.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 10:13:36 -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=gDycxe8WIhEZVnSndKn65sM4fYtaRiCKpUhaU9eIkw4=; b=Xdi0EjLr49Iri7yDOLRuB7tsVmto4YRsXf9LTbbwcONtfIBV1O8OZ9nRctN3eKtE9P uWskvroDJM1Kj0HMOQVBSPOvFRuLB7ncDirNgPChPkr3dFowhx6jZsgejBdlrRSZEcg5 Y390t4syK86tC0yowk/1fCt1OuKOSYVMcbP0UEZ2X8Zd+0ZwAOT1gww4ay+b7s0xbzGm cZ65f1J1Zg/4w2LY8Yq7i8S8l+1wbj155kVWyNnwYAqPngNoyuv9p6DvG+FYs6+cLSVJ 1IBzwOD+BYC1Qzcc+VliAQrHjRGSGZfJGTXhr+HOq+Q3vemKh5KxBuZkO9f9wgq6++Aj xVAA== 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=gDycxe8WIhEZVnSndKn65sM4fYtaRiCKpUhaU9eIkw4=; b=FMBqcRHaYFjsw+fG5R5twu8PJbJHTDUKNHcMmtR/Y2sJLIf9tGq1WAg3YuShImN8pP fqNGEnhRTHuK+ubrE+gIrKH6OER74XWSqxSiC0ZKXs0jXPAooKJggd14n2NM97HovhNF PmgYFUOXZkv9NYabbJx2WNDdSMc0Rey+KKLmSAhzjt49NYkUctjL8yAZBonVjOkITzVj oVd5UuNfncm9ES0bx6JXK0PW9ZdMFwXsCw9ptmO5ZoRvCtj+KKaSnui+kK55PpmNsvue ASTzFc9S8IGThbi2RwG0l6FU7MQYeqAvvxUQYDmtXlWnsLrV6sZp3OkD4rrGeOagT8il LNWA== X-Gm-Message-State: AOAM532lKPQYwLJN7TZf00yMi0j5vIieUsNIiDTlSPVcbVeAa7uCGgzG t3BvvKORCd6LAT+xKITKQ0c= X-Google-Smtp-Source: ABdhPJxN0cMf5kVQ77cUh2PnvCc1kA7k1x3ArwzraF/n6RrTRLObT6jZT7PCPS3hBjeuHILHQ+NaqQ== X-Received: by 2002:a05:6000:136b:: with SMTP id q11mr26107841wrz.350.1620062016882; Mon, 03 May 2021 10:13:36 -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: Artyom Tarasenko , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 6/6] hw/sparc/sun4m: Move each sun4m_hwdef definition in its class_init Date: Mon, 3 May 2021 19:13:03 +0200 Message-Id: <20210503171303.822501-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210503171303.822501-1-f4bug@amsat.org> References: <20210503171303.822501-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 | 248 ++++++++++++++++++++++------------------------- 1 file changed, 118 insertions(+), 130 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 956216591b0..263732b9041 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -1138,9 +1138,22 @@ 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); + static const struct sun4m_hwdef ss5_hwdef =3D { .iommu_base =3D 0x10000000, .iommu_pad_base =3D 0x10004000, .iommu_pad_len =3D 0x0fffb000, @@ -1165,9 +1178,19 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss5_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, - /* SS-10 */ - { + }; + + 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 &ss5_hwdef; +} + +static void ss10_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + static const struct sun4m_hwdef ss10_hwdef =3D { .iommu_base =3D 0xfe0000000ULL, .tcx_base =3D 0xe20000000ULL, .slavio_base =3D 0xff0000000ULL, @@ -1190,9 +1213,19 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss10_id, .iommu_version =3D 0x03000000, .max_mem =3D 0xf00000000ULL, - }, - /* SS-600MP */ - { + }; + + 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 &ss10_hwdef; +} + +static void ss600mp_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + static const struct sun4m_hwdef ss600mp_hwdef =3D { .iommu_base =3D 0xfe0000000ULL, .tcx_base =3D 0xe20000000ULL, .slavio_base =3D 0xff0000000ULL, @@ -1213,9 +1246,19 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss600mp_id, .iommu_version =3D 0x01000000, .max_mem =3D 0xf00000000ULL, - }, - /* SS-20 */ - { + }; + + 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 &ss600mp_hwdef; +} + +static void ss20_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + static const struct sun4m_hwdef ss20_hwdef =3D { .iommu_base =3D 0xfe0000000ULL, .tcx_base =3D 0xe20000000ULL, .slavio_base =3D 0xff0000000ULL, @@ -1254,9 +1297,19 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss20_id, .iommu_version =3D 0x13000000, .max_mem =3D 0xf00000000ULL, - }, - /* Voyager */ - { + }; + + 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 &ss20_hwdef; +} + +static void voyager_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + static const struct sun4m_hwdef voyager_hwdef =3D { .iommu_base =3D 0x10000000, .tcx_base =3D 0x50000000, .slavio_base =3D 0x70000000, @@ -1277,9 +1330,18 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D vger_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, - /* LX */ - { + }; + + mc->desc =3D "Sun4m platform, SPARCstation Voyager"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); + smc->hwdef =3D &voyager_hwdef; +} + +static void ss_lx_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + static const struct sun4m_hwdef ss_lx_hwdef =3D { .iommu_base =3D 0x10000000, .iommu_pad_base =3D 0x10004000, .iommu_pad_len =3D 0x0fffb000, @@ -1301,9 +1363,18 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D lx_id, .iommu_version =3D 0x04000000, .max_mem =3D 0x10000000, - }, - /* SS-4 */ - { + }; + + mc->desc =3D "Sun4m platform, SPARCstation LX"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); + smc->hwdef =3D &ss_lx_hwdef; +} + +static void ss4_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + static const struct sun4m_hwdef ss4_hwdef =3D { .iommu_base =3D 0x10000000, .tcx_base =3D 0x50000000, .cs_base =3D 0x6c000000, @@ -1325,9 +1396,18 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D ss4_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, - /* SPARCClassic */ - { + }; + + mc->desc =3D "Sun4m platform, SPARCstation 4"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); + smc->hwdef =3D &ss4_hwdef; +} + +static void scls_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + static const struct sun4m_hwdef scls_hwdef =3D { .iommu_base =3D 0x10000000, .tcx_base =3D 0x50000000, .slavio_base =3D 0x70000000, @@ -1348,9 +1428,18 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .machine_id =3D scls_id, .iommu_version =3D 0x05000000, .max_mem =3D 0x10000000, - }, - /* SPARCbook */ - { + }; + + mc->desc =3D "Sun4m platform, SPARCClassic"; + mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); + smc->hwdef =3D &scls_hwdef; +} + +static void sbook_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); + static const struct sun4m_hwdef sbook_hwdef =3D { .iommu_base =3D 0x10000000, .tcx_base =3D 0x50000000, /* XXX */ .slavio_base =3D 0x70000000, @@ -1371,112 +1460,11 @@ 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); + }; =20 mc->desc =3D "Sun4m platform, SPARCbook"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); - smc->hwdef =3D &sun4m_hwdefs[8]; + smc->hwdef =3D &sbook_hwdef; } =20 static const TypeInfo sun4m_machine_types[] =3D { --=20 2.26.3