From nobody Fri May 17 11:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619981690; cv=none; d=zohomail.com; s=zohoarc; b=S2jDHxN+xplwVH7WItCzyUwHAyilakcYycq+uSSoMhuue/Hp/p8K+9xw+adLaU5smZfHFnuUqkOyACO/XYQCBIWGiq++2Q9RFoee5AcJelajxLfD8vDxG9cQx+od70q7wbz2ZjPUDI993L0nPxC0fbz6DL/XrT+CGxkzvlCLrCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619981690; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tXUfDRBGkEm7Eeg8Ae9VRIkdlxsH9cTC3rfTZ8DpocY=; b=eaPIOB2/6Ko6jxzZXBRtadrXzLI511pmiUJh4CsLJEM/JUya4OcmjDh3lTmxeuNq+q7qZwSQNX007YlcGzxIhp3uVGElh/y0Yh43LkRDsGphB0i5Y+aG7dnxcKUwuDmyrNFLsBn1CCKKojmwtbyCIlwqMWN44h7cWc+02sM95KE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 16199816904901017.3536311903302; Sun, 2 May 2021 11:54:50 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id 82-20020a1c01550000b0290142562ff7c9so2260035wmb.3 for ; Sun, 02 May 2021 11:54:49 -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 t17sm8792487wmq.12.2021.05.02.11.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 11:54:48 -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=tXUfDRBGkEm7Eeg8Ae9VRIkdlxsH9cTC3rfTZ8DpocY=; b=Cv6odMyp4NRQSBd5/rf0deD6azayFPHQA18ycKAazlPJHchzLYKyCdN84xbGnAMc9Y HrlNApfiVwSZU29uExZ3IwpIaK/ziGgILHTl3xKDjeLNIZ8SbRQw8VChnvy9DMtLJVq5 1T36CIVmUnqaYhPs+MSMiW2WVdss/4f/MoeBHxR0P9JF2dEbjh9UiTySjKu0cKPmzrGU 0e0DgPRa0niNQfsAJ4qWqomHP5yLRJqqqVRVoNPhfdinX38n0nXcLUCsQxIr/KlJsxD5 Ep9QDoYUhfVHvI2MxlFbnjOOS2aqNeupwyeCqqthe8vZ7ZTpPqgOUvW/8JTicAzolx1h rjRg== 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=tXUfDRBGkEm7Eeg8Ae9VRIkdlxsH9cTC3rfTZ8DpocY=; b=JVaCS3WrNU0RX1cKM/SiI+v3pSa2ma+img84MSCkzHdUEvAfZZrMWMj+nWl3skoEDR noa3+XIqZwVaIJZVyYLzDXvc5IYJrM89CsJ26iyf8iTjXhbdrxCINrdyo2Ge3k+NlhLk dQPGhD1o5g31mXiXkF/5S4NjP4LWKcCC7HddIrFxqgmpAVxn9MoI2o2c1X6qVY2FCqW0 AXAEofzCeFAg03PcbIYcqxH5wXUAnl6hqzWxKUunO6ya14nnGFC3mUYCIfhOL6EcWld3 4apJHPVU/5AEcyYIvw+YzCa5ZO93DLm/DbrsACihv3gxqGlQFKP4Z18cJOXdIJ+Da5Mq O4hw== X-Gm-Message-State: AOAM533FkJ756Q6blNDjU9+8iAG8PxDmMX3X0QmSj1fTPHmFi8zz3UE+ UcVTk2+o5zNcvvE8Cx5Rgw6nq4I/rqlNZzDE X-Google-Smtp-Source: ABdhPJzzHeWsRNNzLmD7CBN9FIQvRcQkK5yVOr3DOitD9yqOoagnGNADlvvE/hWVXRCCAyczcHQe9Q== X-Received: by 2002:a1c:35c6:: with SMTP id c189mr27692421wma.127.1619981688764; Sun, 02 May 2021 11:54:48 -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 1/6] hw/sparc/sun4m: Have sun4m machines inherit new TYPE_SUN4M_MACHINE Date: Sun, 2 May 2021 20:54:36 +0200 Message-Id: <20210502185441.599980-2-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) Introduce the TYPE_SUN4M_MACHINE and have all sun4m machines inherit it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/sparc/sun4m.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 1a00816d9a8..9d07fa43d6a 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -107,6 +107,8 @@ struct sun4m_hwdef { uint8_t nvram_machine_id; }; =20 +#define TYPE_SUN4M_MACHINE MACHINE_TYPE_NAME("sun4m-common") + const char *fw_cfg_arch_key_name(uint16_t key) { static const struct { @@ -1433,7 +1435,7 @@ static void ss5_class_init(ObjectClass *oc, void *dat= a) =20 static const TypeInfo ss5_type =3D { .name =3D MACHINE_TYPE_NAME("SS-5"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D ss5_class_init, }; =20 @@ -1453,7 +1455,7 @@ static void ss10_class_init(ObjectClass *oc, void *da= ta) =20 static const TypeInfo ss10_type =3D { .name =3D MACHINE_TYPE_NAME("SS-10"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D ss10_class_init, }; =20 @@ -1473,7 +1475,7 @@ static void ss600mp_class_init(ObjectClass *oc, void = *data) =20 static const TypeInfo ss600mp_type =3D { .name =3D MACHINE_TYPE_NAME("SS-600MP"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D ss600mp_class_init, }; =20 @@ -1493,7 +1495,7 @@ static void ss20_class_init(ObjectClass *oc, void *da= ta) =20 static const TypeInfo ss20_type =3D { .name =3D MACHINE_TYPE_NAME("SS-20"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D ss20_class_init, }; =20 @@ -1512,7 +1514,7 @@ static void voyager_class_init(ObjectClass *oc, void = *data) =20 static const TypeInfo voyager_type =3D { .name =3D MACHINE_TYPE_NAME("Voyager"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D voyager_class_init, }; =20 @@ -1531,7 +1533,7 @@ static void ss_lx_class_init(ObjectClass *oc, void *d= ata) =20 static const TypeInfo ss_lx_type =3D { .name =3D MACHINE_TYPE_NAME("LX"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D ss_lx_class_init, }; =20 @@ -1550,7 +1552,7 @@ static void ss4_class_init(ObjectClass *oc, void *dat= a) =20 static const TypeInfo ss4_type =3D { .name =3D MACHINE_TYPE_NAME("SS-4"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D ss4_class_init, }; =20 @@ -1569,7 +1571,7 @@ static void scls_class_init(ObjectClass *oc, void *da= ta) =20 static const TypeInfo scls_type =3D { .name =3D MACHINE_TYPE_NAME("SPARCClassic"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D scls_class_init, }; =20 @@ -1588,10 +1590,20 @@ static void sbook_class_init(ObjectClass *oc, void = *data) =20 static const TypeInfo sbook_type =3D { .name =3D MACHINE_TYPE_NAME("SPARCbook"), - .parent =3D TYPE_MACHINE, + .parent =3D TYPE_SUN4M_MACHINE, .class_init =3D sbook_class_init, }; =20 +static const TypeInfo sun4m_machine_types[] =3D { + { + .name =3D TYPE_SUN4M_MACHINE, + .parent =3D TYPE_MACHINE, + .abstract =3D true, + } +}; + +DEFINE_TYPES(sun4m_machine_types) + static void sun4m_register_types(void) { type_register_static(&idreg_info); --=20 2.26.3 From nobody Fri May 17 11:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619981697; cv=none; d=zohomail.com; s=zohoarc; b=nwVFyn77D/jJ5qqK785lbo9K+1S0F49c362qvx5xIcQBDDOOBgEfixBx2xGdBNprSXsQ9kpsmX4dVRAkwKE5vIYZ/KuzbG9N8K79rlkKnNEkF/x0SH6whQMVsXC+Rmdj7X+XcayakOQ8qFOrVuBrWe8e3RX8ickDAvCs5zOh8yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619981697; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ORJ6PHqBOe/8VvmzXQTX/7ZRHvZdsh6KqK7WDIrVMjo=; b=cP+lvzINju5u750iSya8cbR/X4WHgMxLOkaR4qHgC26hQ3kMV6jYDTUbhbNKm1B4azhb5AxA5QpnDukeX9k8pd057lKFkhT5QZehyclhL5nIocCyzNrxIh4Zp5SIlKBnSVbMvBIZNH0ZIZsHrf1ECKPkYFJSWCU/c93iDOvqz34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1619981697634941.6688735290074; Sun, 2 May 2021 11:54:57 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id t18so3348536wry.1 for ; Sun, 02 May 2021 11:54:55 -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 a126sm6571126wmh.37.2021.05.02.11.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 11:54:53 -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=ORJ6PHqBOe/8VvmzXQTX/7ZRHvZdsh6KqK7WDIrVMjo=; b=tXcYsUZup3iiuheqcts6Ut2kSlCjX08TYc9V6BD/CjS6zacJLtar/eovag8kP6l9hU /DXGn4XomtoQSJMvKZqR0lwXw96YiXMr/sv72SkBL2FxabrIJr6H29d8ik+Kr47xmFRS nDMu7E6HMHsF6oM0s3B0RqRAzqjvPaWkvtOyubcc4F2dBTGWe1b3fDPenS8Jx2e0auon YNvtYi9ToQkCkvxLPb34GYC3ACx1JdOLZd1Sk4YRAjbC89UWKidwyIK4wap0CMTITxcq qqg1iJSwpDmqJEHP/KBASjig5vaNeX2KSl60Q8pJDynPbuekmYIlSaGVLFDynBCStw2I fwvw== 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=ORJ6PHqBOe/8VvmzXQTX/7ZRHvZdsh6KqK7WDIrVMjo=; b=HmpwQciOixBYtiDmerYeIp/chL73WaHZlMUKQgbNL6HUtKgidUtCYKeD2Sxvw9IISc sgxokPWLsXwrXHvhc6gdaJiU6xq9V72cPy3GrdIdo66BVOgAXSxn5ZcsTt10jTdRO6qD 8Zu0982sK+2Yp23rbWctZF+BQ6jpGMVamP716nNIco3IS3HsUWbtO3mYTU1DqeIeD2C1 vNzSOacwzTvUvcUVDPYGwA4fsT9w4ZNcmA9bex4nwBE+Hw/b+FOAT8pTv/SaERNWOM6p B+6ajuOIgOwEYWp+OulDRmDO1MbZROBGCt7kW857s+9caTVFT8uw3n5PU7XyRjavWG73 m2kw== X-Gm-Message-State: AOAM533tfBjKee0nvvAi2PEDG6G3SV1cDU7FveS8LznoZ842ajZIUsi9 Gt6W8/ZGzOR1xRPKLE2jG68= X-Google-Smtp-Source: ABdhPJzseWUTBUcjXNyd02rlEXfkSdIaDCNJ2CG9O79mkO294GlQv3I2H2E/oXofmerMt2AsW+K+cA== X-Received: by 2002:a5d:648e:: with SMTP id o14mr16919117wri.27.1619981693887; Sun, 02 May 2021 11:54:53 -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 2/6] hw/sparc/sun4m: Introduce Sun4mMachineClass Date: Sun, 2 May 2021 20:54:37 +0200 Message-Id: <20210502185441.599980-3-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) Instead of passing the sun4m_hwdef structure via machine_init(), store it into the MachineClass. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/sparc/sun4m.c | 50 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 9d07fa43d6a..c2bc8a9fa50 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -107,7 +107,16 @@ struct sun4m_hwdef { uint8_t nvram_machine_id; }; =20 +struct Sun4mMachineClass { + /*< private >*/ + MachineClass parent_obj; + /*< public >*/ + const struct sun4m_hwdef *hwdef; +}; +typedef struct Sun4mMachineClass Sun4mMachineClass; + #define TYPE_SUN4M_MACHINE MACHINE_TYPE_NAME("sun4m-common") +DECLARE_CLASS_CHECKERS(Sun4mMachineClass, SUN4M_MACHINE, TYPE_SUN4M_MACHIN= E) =20 const char *fw_cfg_arch_key_name(uint16_t key) { @@ -839,9 +848,9 @@ static void dummy_fdc_tc(void *opaque, int irq, int lev= el) { } =20 -static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, - MachineState *machine) +static void sun4m_hw_init(MachineState *machine) { + const struct sun4m_hwdef *hwdef =3D SUN4M_MACHINE_GET_CLASS(machine)->= hwdef; DeviceState *slavio_intctl; unsigned int i; Nvram *nvram; @@ -1368,60 +1377,61 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { /* SPARCstation 5 hardware initialisation */ static void ss5_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[0], machine); + sun4m_hw_init(machine); } =20 /* SPARCstation 10 hardware initialisation */ static void ss10_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[1], machine); + sun4m_hw_init(machine); } =20 /* SPARCserver 600MP hardware initialisation */ static void ss600mp_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[2], machine); + sun4m_hw_init(machine); } =20 /* SPARCstation 20 hardware initialisation */ static void ss20_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[3], machine); + sun4m_hw_init(machine); } =20 /* SPARCstation Voyager hardware initialisation */ static void vger_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[4], machine); + sun4m_hw_init(machine); } =20 /* SPARCstation LX hardware initialisation */ static void ss_lx_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[5], machine); + sun4m_hw_init(machine); } =20 /* SPARCstation 4 hardware initialisation */ static void ss4_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[6], machine); + sun4m_hw_init(machine); } =20 /* SPARCClassic hardware initialisation */ static void scls_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[7], machine); + sun4m_hw_init(machine); } =20 /* SPARCbook hardware initialisation */ static void sbook_init(MachineState *machine) { - sun4m_hw_init(&sun4m_hwdefs[8], machine); + sun4m_hw_init(machine); } =20 static void ss5_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, SPARCstation 5"; mc->init =3D ss5_init; @@ -1431,6 +1441,7 @@ static void ss5_class_init(ObjectClass *oc, void *dat= a) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[0]; } =20 static const TypeInfo ss5_type =3D { @@ -1442,6 +1453,7 @@ static const TypeInfo ss5_type =3D { static void ss10_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, SPARCstation 10"; mc->init =3D ss10_init; @@ -1451,6 +1463,7 @@ static void ss10_class_init(ObjectClass *oc, void *da= ta) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[1]; } =20 static const TypeInfo ss10_type =3D { @@ -1462,6 +1475,7 @@ static const TypeInfo ss10_type =3D { static void ss600mp_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, SPARCserver 600MP"; mc->init =3D ss600mp_init; @@ -1471,6 +1485,7 @@ static void ss600mp_class_init(ObjectClass *oc, void = *data) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[2]; } =20 static const TypeInfo ss600mp_type =3D { @@ -1482,6 +1497,7 @@ static const TypeInfo ss600mp_type =3D { static void ss20_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, SPARCstation 20"; mc->init =3D ss20_init; @@ -1491,6 +1507,7 @@ static void ss20_class_init(ObjectClass *oc, void *da= ta) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[3]; } =20 static const TypeInfo ss20_type =3D { @@ -1502,6 +1519,7 @@ static const TypeInfo ss20_type =3D { static void voyager_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, SPARCstation Voyager"; mc->init =3D vger_init; @@ -1510,6 +1528,7 @@ static void voyager_class_init(ObjectClass *oc, void = *data) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[4]; } =20 static const TypeInfo voyager_type =3D { @@ -1521,6 +1540,7 @@ static const TypeInfo voyager_type =3D { static void ss_lx_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, SPARCstation LX"; mc->init =3D ss_lx_init; @@ -1529,6 +1549,7 @@ static void ss_lx_class_init(ObjectClass *oc, void *d= ata) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[5]; } =20 static const TypeInfo ss_lx_type =3D { @@ -1540,6 +1561,7 @@ static const TypeInfo ss_lx_type =3D { static void ss4_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, SPARCstation 4"; mc->init =3D ss4_init; @@ -1548,6 +1570,7 @@ static void ss4_class_init(ObjectClass *oc, void *dat= a) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[6]; } =20 static const TypeInfo ss4_type =3D { @@ -1559,6 +1582,7 @@ static const TypeInfo ss4_type =3D { static void scls_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, SPARCClassic"; mc->init =3D scls_init; @@ -1567,6 +1591,7 @@ static void scls_class_init(ObjectClass *oc, void *da= ta) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[7]; } =20 static const TypeInfo scls_type =3D { @@ -1578,6 +1603,7 @@ static const TypeInfo scls_type =3D { 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->init =3D sbook_init; @@ -1586,6 +1612,7 @@ static void sbook_class_init(ObjectClass *oc, void *d= ata) mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); mc->default_display =3D "tcx"; mc->default_ram_id =3D "sun4m.ram"; + smc->hwdef =3D &sun4m_hwdefs[8]; } =20 static const TypeInfo sbook_type =3D { @@ -1598,6 +1625,7 @@ static const TypeInfo sun4m_machine_types[] =3D { { .name =3D TYPE_SUN4M_MACHINE, .parent =3D TYPE_MACHINE, + .class_size =3D sizeof(Sun4mMachineClass), .abstract =3D true, } }; --=20 2.26.3 From nobody Fri May 17 11:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619981700; cv=none; d=zohomail.com; s=zohoarc; b=RL7V/YSVgOwStDPP3fiGtrEs9r+tokPb6IAB3glIQ+VSx4Xe9tpXcSdIlXjKgZit6ZjAo6bobLHNxpQe54ViPigucRuWINQO/olYWH9O6p8W60942GQsqqhZrgyVSTOSW8AN/AvGhRl0mNR47A0nimpOjMXsXedAqY89qi6rPl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619981700; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yF+3uGpjysT1HviFnkbcw6nMCr/LSI0PjwhjHOnIHGg=; b=JQOUpzPHpYfQA7LeUj1H3bAbfOiEMcvwXlcWgtaOpdyRLE4FAHhtZd0ZrXknOuqi/ckml315/zdFchESqIiR7S/aNrFse/psvtQ/Y/oaumNPd2nfkF6QbnybVTdwKIkLo9m/8o/YAYuiK7yjTpDTKy1kRPP3nRiSQ8Rp7br5QFM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1619981700614818.3747849437657; Sun, 2 May 2021 11:55:00 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id l14so3337799wrx.5 for ; Sun, 02 May 2021 11:55:00 -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 a15sm9592312wrr.53.2021.05.02.11.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 11:54:58 -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=yF+3uGpjysT1HviFnkbcw6nMCr/LSI0PjwhjHOnIHGg=; b=BEBaAdFThGNA9MEJYcFmjrOPmoS9KQ56T5Ahml3uLfXK1nxHxLoWp5Y+Sz4Jl7WMxz bmaYKc2SsPphsxL/LuVqVZU01D4sC4pwN4c0cOREx7EN+cxQyiQCOWF97ZYv2A4R2ruy w8lXxNDqEGLQVTc61ht+JA9o1yKmx7iD+27GumfIznTODbTbM1n6jEJc72HWIXxMxTJ8 u6y35IM9BNVkZfmtnxNsK9xHWXsCzXikgJZ8zemgAB8J4845yQ6ZEV2zTOyMERxahRi8 9jXbyqI/XJhpnWbpXGCKc2XxWWyqd72am0++DEHzD9Wx4USiz0U6xubQP/Z6gA20+TW1 s3Sw== 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=yF+3uGpjysT1HviFnkbcw6nMCr/LSI0PjwhjHOnIHGg=; b=eLUs1AFPnvsvHsVOjh0rw3UWTtQmpulBGlDkjT5geyRtXnZAWaT4R5NYNVv3jBmbRK 6+4dzNPDwcSgaSpqzKUJQ2GLz8K6Y3fMEMyb00oIi81LcIm0fuD3in9vzn8NAKrPH+Ua 3xd1UcVqPBu43/DcenCmOTh5ngwFrMTVB0hHSOsh3Xfaw6wlVN1+IfMLUf3GnRxsgv2n NqJtoxOUSZOe++HUpx6te/PnkP4u9Te5sc9iZHSU0eIDvgirlb2D06gI8rqw/rcIrIV7 jxQABxFUEOPXXkK9yQ2B5A8jZ3cc3omSe/gbLzx1Rt6PuUKQ3/j8M90tIESUyLcl1QND ZphQ== X-Gm-Message-State: AOAM532nJYLhFRN9rmkKN8rnI6wO2suWMv1uiQv0MTHu2i52VY8CXbZZ P2nNwZifL0YbnRuPtsgIyPA= X-Google-Smtp-Source: ABdhPJxIi3KEnCh+g7UFdHRLU2EUsVjHLJ+SWJZKJoSInUhVZgxCirehdHHbewos5OJRGI2mc4xRNQ== X-Received: by 2002:a5d:544d:: with SMTP id w13mr2820223wrv.273.1619981698893; Sun, 02 May 2021 11:54:58 -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 3/6] hw/sparc/sun4m: Factor out sun4m_machine_class_init() Date: Sun, 2 May 2021 20:54:38 +0200 Message-Id: <20210502185441.599980-4-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) Factor out the class_init code common to all machines to sun4m_machine_class_init(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/sparc/sun4m.c | 103 ++++------------------------------------------- 1 file changed, 8 insertions(+), 95 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index c2bc8a9fa50..56f927e66ca 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -1374,58 +1374,15 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { }, }; =20 -/* SPARCstation 5 hardware initialisation */ -static void ss5_init(MachineState *machine) +static void sun4m_machine_class_init(ObjectClass *oc, void *data) { - sun4m_hw_init(machine); -} + MachineClass *mc =3D MACHINE_CLASS(oc); =20 -/* SPARCstation 10 hardware initialisation */ -static void ss10_init(MachineState *machine) -{ - sun4m_hw_init(machine); -} - -/* SPARCserver 600MP hardware initialisation */ -static void ss600mp_init(MachineState *machine) -{ - sun4m_hw_init(machine); -} - -/* SPARCstation 20 hardware initialisation */ -static void ss20_init(MachineState *machine) -{ - sun4m_hw_init(machine); -} - -/* SPARCstation Voyager hardware initialisation */ -static void vger_init(MachineState *machine) -{ - sun4m_hw_init(machine); -} - -/* SPARCstation LX hardware initialisation */ -static void ss_lx_init(MachineState *machine) -{ - sun4m_hw_init(machine); -} - -/* SPARCstation 4 hardware initialisation */ -static void ss4_init(MachineState *machine) -{ - sun4m_hw_init(machine); -} - -/* SPARCClassic hardware initialisation */ -static void scls_init(MachineState *machine) -{ - sun4m_hw_init(machine); -} - -/* SPARCbook hardware initialisation */ -static void sbook_init(MachineState *machine) -{ - sun4m_hw_init(machine); + 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"; } =20 static void ss5_class_init(ObjectClass *oc, void *data) @@ -1434,13 +1391,8 @@ static void ss5_class_init(ObjectClass *oc, void *da= ta) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCstation 5"; - mc->init =3D ss5_init; - mc->block_default_type =3D IF_SCSI; mc->is_default =3D true; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[0]; } =20 @@ -1456,13 +1408,8 @@ static void ss10_class_init(ObjectClass *oc, void *d= ata) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCstation 10"; - mc->init =3D ss10_init; - mc->block_default_type =3D IF_SCSI; mc->max_cpus =3D 4; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[1]; } =20 @@ -1478,13 +1425,8 @@ static void ss600mp_class_init(ObjectClass *oc, void= *data) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCserver 600MP"; - mc->init =3D ss600mp_init; - mc->block_default_type =3D IF_SCSI; mc->max_cpus =3D 4; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[2]; } =20 @@ -1500,13 +1442,8 @@ static void ss20_class_init(ObjectClass *oc, void *d= ata) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCstation 20"; - mc->init =3D ss20_init; - mc->block_default_type =3D IF_SCSI; mc->max_cpus =3D 4; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-SuperSparc-II"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[3]; } =20 @@ -1522,12 +1459,7 @@ static void voyager_class_init(ObjectClass *oc, void= *data) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCstation Voyager"; - mc->init =3D vger_init; - mc->block_default_type =3D IF_SCSI; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[4]; } =20 @@ -1543,12 +1475,7 @@ static void ss_lx_class_init(ObjectClass *oc, void *= data) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCstation LX"; - mc->init =3D ss_lx_init; - mc->block_default_type =3D IF_SCSI; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[5]; } =20 @@ -1564,12 +1491,7 @@ static void ss4_class_init(ObjectClass *oc, void *da= ta) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCstation 4"; - mc->init =3D ss4_init; - mc->block_default_type =3D IF_SCSI; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("Fujitsu-MB86904"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[6]; } =20 @@ -1585,12 +1507,7 @@ static void scls_class_init(ObjectClass *oc, void *d= ata) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCClassic"; - mc->init =3D scls_init; - mc->block_default_type =3D IF_SCSI; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[7]; } =20 @@ -1606,12 +1523,7 @@ static void sbook_class_init(ObjectClass *oc, void *= data) Sun4mMachineClass *smc =3D SUN4M_MACHINE_CLASS(mc); =20 mc->desc =3D "Sun4m platform, SPARCbook"; - mc->init =3D sbook_init; - mc->block_default_type =3D IF_SCSI; - mc->default_boot_order =3D "c"; mc->default_cpu_type =3D SPARC_CPU_TYPE_NAME("TI-MicroSparc-I"); - mc->default_display =3D "tcx"; - mc->default_ram_id =3D "sun4m.ram"; smc->hwdef =3D &sun4m_hwdefs[8]; } =20 @@ -1626,6 +1538,7 @@ static const TypeInfo sun4m_machine_types[] =3D { .name =3D TYPE_SUN4M_MACHINE, .parent =3D TYPE_MACHINE, .class_size =3D sizeof(Sun4mMachineClass), + .class_init =3D sun4m_machine_class_init, .abstract =3D true, } }; --=20 2.26.3 From nobody Fri May 17 11:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619981705; cv=none; d=zohomail.com; s=zohoarc; b=SqbZpQCl4k7ZehpG+U3rq2JJZu9TxT8lSjmn656VjiIjSGkxefZOcXPPheqCQyVMqI58EIUHL5KXk4OA5OfOszyevaHsUE8emZQfujyz3ODqBInzagFbt5QBQ6bOk5kALl5BayFgui1PqC0bCA9RTPPi2XV+0+34jG4kY2ppMfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619981705; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J0fq0tgV0XnQZWCzCWhA2xB44pEZvjl2wJSY1xGfPWQ=; b=gDVUnGfgrZYGb0RVE7OBZ09d7LqgretajkFzh3GNyod4OtqCb3VI7qm7wMI1BBshX3CHB2W5nkOWdu6oN97Hxg0k+/loqYd0LBnYYBwOOU41o+78DLi8dQDB59Q+RsJ2tMDB5drSFWfVhjCw+E7GU73+G8Fq7UOoTmz5m3c5GJU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1619981705423614.516332713306; Sun, 2 May 2021 11:55:05 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id i21-20020a05600c3555b029012eae2af5d4so4553773wmq.4 for ; Sun, 02 May 2021 11:55:04 -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 u2sm18903577wmc.22.2021.05.02.11.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 11:55:03 -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=J0fq0tgV0XnQZWCzCWhA2xB44pEZvjl2wJSY1xGfPWQ=; b=Qp0BnW0RowNqxS0Q0ShXg6PCiAiYIWO6VvTVOYRj8bosKr36BzKjYjYHKlbKYhlra/ s/8bec9ZSgFintcCn2x8Y+vdob2mUTL23QzRk4dEzcnX1+gsDFRGDMRU1PqmrrFxVrtE XwIysfYg8KW+Z5pIgYZgq9rdDhVyTJiz05WSsyINxVi0AZz6/xcnw/06X/fblOyAoUoZ P4/YWWpran8CqpDVpCFNSM5lsoFrT6pytbz65sqMGyyBTdy+7KErikOurJW6zsgfj026 6jhLRrtq1T4HrFSeKO5c+vpLVDyodq4EW+hvUdhVDVVsiYNS9yFGYVrLB/TqXmbJ620A uo+Q== 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=J0fq0tgV0XnQZWCzCWhA2xB44pEZvjl2wJSY1xGfPWQ=; b=CBgDusTG/ZBGEPfrP3G8NHkJtj7WBbHbegGVLDw/wDwP1PSDpFEwoGvUURGT+rL94m 8gFUgoM+39bpoUFAUWUua7qwqUQAPxJU2fvDuE0wDl4LG0cSiqAdDDeqnZXRy/uAN5Qa DYRuC0lK9qoYR6xLVTO4aBov0BhEfpT0EsyJbX7dP33qnHfsdES3yiDLNDU0dxDM3rj6 5ozOOiVNpiwokw9r6ML5wf/aD67Gzi2FIsXftdlII4dWkeLtBCdn3gyTZnlTPLhFZWCW dnKlcCaIVmTw+XT5TiLhxi2AAdfkoNUaYuIQXzzoFZEsZeHsBeztM4ix2DJfPLzt0hBR FkGw== X-Gm-Message-State: AOAM531sVUnrqlGb0wVonXf2OTiORxXmDuLt5A6eLxLw8BPnNyqQJQcF 9Z5TTOESIMnbsJ8PgKn0tY0= X-Google-Smtp-Source: ABdhPJzpg3/VHSPXQFC9S4KxjujWDunLHJSN0eCKd2EOdiX9cGoXwJaS/0cdCryGZDHzNWKQ60a2/Q== X-Received: by 2002:a05:600c:4fd0:: with SMTP id o16mr6006843wmq.107.1619981703665; Sun, 02 May 2021 11:55:03 -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 4/6] hw/sparc/sun4m: Register machine types in sun4m_machine_types[] Date: Sun, 2 May 2021 20:54:39 +0200 Message-Id: <20210502185441.599980-5-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/sparc/sun4m.c | 100 +++++++++++++++++------------------------------ 1 file changed, 36 insertions(+), 64 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 56f927e66ca..a625c41cd37 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -1396,12 +1396,6 @@ static void ss5_class_init(ObjectClass *oc, void *da= ta) smc->hwdef =3D &sun4m_hwdefs[0]; } =20 -static const TypeInfo ss5_type =3D { - .name =3D MACHINE_TYPE_NAME("SS-5"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D ss5_class_init, -}; - static void ss10_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1413,12 +1407,6 @@ static void ss10_class_init(ObjectClass *oc, void *d= ata) smc->hwdef =3D &sun4m_hwdefs[1]; } =20 -static const TypeInfo ss10_type =3D { - .name =3D MACHINE_TYPE_NAME("SS-10"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D ss10_class_init, -}; - static void ss600mp_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1430,12 +1418,6 @@ static void ss600mp_class_init(ObjectClass *oc, void= *data) smc->hwdef =3D &sun4m_hwdefs[2]; } =20 -static const TypeInfo ss600mp_type =3D { - .name =3D MACHINE_TYPE_NAME("SS-600MP"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D ss600mp_class_init, -}; - static void ss20_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1447,12 +1429,6 @@ static void ss20_class_init(ObjectClass *oc, void *d= ata) smc->hwdef =3D &sun4m_hwdefs[3]; } =20 -static const TypeInfo ss20_type =3D { - .name =3D MACHINE_TYPE_NAME("SS-20"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D ss20_class_init, -}; - static void voyager_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1463,12 +1439,6 @@ static void voyager_class_init(ObjectClass *oc, void= *data) smc->hwdef =3D &sun4m_hwdefs[4]; } =20 -static const TypeInfo voyager_type =3D { - .name =3D MACHINE_TYPE_NAME("Voyager"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D voyager_class_init, -}; - static void ss_lx_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1479,12 +1449,6 @@ static void ss_lx_class_init(ObjectClass *oc, void *= data) smc->hwdef =3D &sun4m_hwdefs[5]; } =20 -static const TypeInfo ss_lx_type =3D { - .name =3D MACHINE_TYPE_NAME("LX"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D ss_lx_class_init, -}; - static void ss4_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1495,12 +1459,6 @@ static void ss4_class_init(ObjectClass *oc, void *da= ta) smc->hwdef =3D &sun4m_hwdefs[6]; } =20 -static const TypeInfo ss4_type =3D { - .name =3D MACHINE_TYPE_NAME("SS-4"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D ss4_class_init, -}; - static void scls_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1511,12 +1469,6 @@ static void scls_class_init(ObjectClass *oc, void *d= ata) smc->hwdef =3D &sun4m_hwdefs[7]; } =20 -static const TypeInfo scls_type =3D { - .name =3D MACHINE_TYPE_NAME("SPARCClassic"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D scls_class_init, -}; - static void sbook_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1527,14 +1479,44 @@ static void sbook_class_init(ObjectClass *oc, void = *data) smc->hwdef =3D &sun4m_hwdefs[8]; } =20 -static const TypeInfo sbook_type =3D { - .name =3D MACHINE_TYPE_NAME("SPARCbook"), - .parent =3D TYPE_SUN4M_MACHINE, - .class_init =3D sbook_class_init, -}; - static const TypeInfo sun4m_machine_types[] =3D { { + .name =3D MACHINE_TYPE_NAME("SS-5"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D ss5_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("SS-10"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D ss10_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("SS-600MP"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D ss600mp_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("SS-20"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D ss20_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("Voyager"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D voyager_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("LX"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D ss_lx_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("SS-4"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D ss4_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("SPARCClassic"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D scls_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("SPARCbook"), + .parent =3D TYPE_SUN4M_MACHINE, + .class_init =3D sbook_class_init, + }, { .name =3D TYPE_SUN4M_MACHINE, .parent =3D TYPE_MACHINE, .class_size =3D sizeof(Sun4mMachineClass), @@ -1551,16 +1533,6 @@ static void sun4m_register_types(void) type_register_static(&afx_info); type_register_static(&prom_info); type_register_static(&ram_info); - - type_register_static(&ss5_type); - type_register_static(&ss10_type); - type_register_static(&ss600mp_type); - type_register_static(&ss20_type); - type_register_static(&voyager_type); - type_register_static(&ss_lx_type); - type_register_static(&ss4_type); - type_register_static(&scls_type); - type_register_static(&sbook_type); } =20 type_init(sun4m_register_types) --=20 2.26.3 From nobody Fri May 17 11:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619981710; cv=none; d=zohomail.com; s=zohoarc; b=B3/xO2E6oOENKEGciEzafQIFOSb2ELyrc2u4+RzvdEES9JuEvwNGqu0uBoGNg8pT6HFX+eLOqvDz5ObzKD1RMO9ecwNPejQU8Bv8mcg69CK5AjsHI92iXHuhyXTKF1iYmGrMTWEhs29qBQa0bcQRqxK+NyMNuS4VzGaK9QjZfK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619981710; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fQSQe8AmFNdH7/S8ocBiYkSMiEn25ODIF1so8U4TOrA=; b=E9BwWfNmkVY/dkmaDrEArEqK8jm+bIDFp6fwh9DPuXY3wkEEUAAj1xJ4qac4BzA9wHME1R035V1CCvtgf7VH9oMnFgdJFZ56cE55DxUR5iJ00HkuiWSEH3xkcRsN/Kn1UZCWXlGt1adb09mW3OZc6pRadGZ75btcfBwEwk4B3SU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1619981710205970.6078907349131; Sun, 2 May 2021 11:55:10 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id b11-20020a7bc24b0000b0290148da0694ffso2073583wmj.2 for ; Sun, 02 May 2021 11:55:09 -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 a9sm9395600wrw.26.2021.05.02.11.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 May 2021 11:55:08 -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=fQSQe8AmFNdH7/S8ocBiYkSMiEn25ODIF1so8U4TOrA=; b=Iu4YAIExLWBTgwL8hn+reIewFCffelASF13cm+xGGdHb36GMp0loDrxqif9IPunFa8 84PUOxyp8MaSqyGuLqBkWypWvUGhN2jKwjPejIocDpHpC+cMlvpUtYsuOB0DiGqZeg5o 3EETlRiDdA0OgqRHnE/2ir445vHUM4UVRGbHitNLw9QMZvS4vxi9mWf8e3fa9SkvwFp0 xdKsbQc3UrzL4+LZbWc60aQd0zGU6x3ddNV+Ku5JBYNZQzzqArgGERgHWe1mAaRa3h9S ixzig4qeE+7NJ/oPR+lDQ1mKNQHrIf2BvzK3OSmurFFwNryaQobrPtobmZuhcGjpBfK9 phHA== 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=fQSQe8AmFNdH7/S8ocBiYkSMiEn25ODIF1so8U4TOrA=; b=maFrmUlBdueY/pVMx4WtqJdoEkkkX8wvpAVhFM7zGVhe57j5Q/A7r414P8QVHcwamK 73CAulk5VviU5MowqnKE3YPw9GTcZo8pt4oGHXO297DunLLduRjC5krwxvHn/fvu8myH sUewB4cNpUfdm8aKvAFovs9Z7kNXEw7Ls4ab2ZREgtOQSXrZwKWeMISTUiYKTN5aezNY dabai5h8DxSbOeVOeMXgFon6mbItfCb2IOp4YwyvVShXA/LRF6skRlfo5mJ5CR4lzN9+ CMaMhY/jNMPEx5cUx67JZlXSFnzGcy0c/s7OgbNFry42aiCvBy2HIJBUyMNks0oNllgg M+eg== X-Gm-Message-State: AOAM531FSJSEuKPLIjCFAuvZFSRsAlUhpn1eFoOzz1VMONHAzaEeQOGW ZCYSOxI4oGbaPEOWWqjf5UZPbGUqQ9BrMpEQ X-Google-Smtp-Source: ABdhPJwTZyTRI3IzELMAYh1asWJaduUM8sOtbqiTceAtCZnaGCD7Sy8cBC29Ho18XDVOENKgOjD33A== X-Received: by 2002:a05:600c:4304:: with SMTP id p4mr4166695wme.111.1619981708562; Sun, 02 May 2021 11:55:08 -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 5/6] hw/sparc/sun4m: Fix code style for checkpatch.pl Date: Sun, 2 May 2021 20:54:40 +0200 Message-Id: <20210502185441.599980-6-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) We are going to move this code, fix its style first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/sparc/sun4m.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index a625c41cd37..956216591b0 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -1181,11 +1181,11 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .dma_base =3D 0xef0400000ULL, .esp_base =3D 0xef0800000ULL, .le_base =3D 0xef0c00000ULL, - .apc_base =3D 0xefa000000ULL, // XXX should not exist + .apc_base =3D 0xefa000000ULL, /* XXX should not exist */ .aux1_base =3D 0xff1800000ULL, .aux2_base =3D 0xff1a01000ULL, .ecc_base =3D 0xf00000000ULL, - .ecc_version =3D 0x10000000, // version 0, implementation 1 + .ecc_version =3D 0x10000000, /* version 0, implementation 1 */ .nvram_machine_id =3D 0x72, .machine_id =3D ss10_id, .iommu_version =3D 0x03000000, @@ -1204,11 +1204,11 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .dma_base =3D 0xef0081000ULL, .esp_base =3D 0xef0080000ULL, .le_base =3D 0xef0060000ULL, - .apc_base =3D 0xefa000000ULL, // XXX should not exist + .apc_base =3D 0xefa000000ULL, /* XXX should not exist */ .aux1_base =3D 0xff1800000ULL, - .aux2_base =3D 0xff1a01000ULL, // XXX should not exist + .aux2_base =3D 0xff1a01000ULL, /* XXX should not exist */ .ecc_base =3D 0xf00000000ULL, - .ecc_version =3D 0x00000000, // version 0, implementation 0 + .ecc_version =3D 0x00000000, /* version 0, implementation 0 */ .nvram_machine_id =3D 0x71, .machine_id =3D ss600mp_id, .iommu_version =3D 0x01000000, @@ -1230,7 +1230,7 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .esp_base =3D 0xef0800000ULL, .le_base =3D 0xef0c00000ULL, .bpp_base =3D 0xef4800000ULL, - .apc_base =3D 0xefa000000ULL, // XXX should not exist + .apc_base =3D 0xefa000000ULL, /* XXX should not exist */ .aux1_base =3D 0xff1800000ULL, .aux2_base =3D 0xff1a01000ULL, .dbri_base =3D 0xee0000000ULL, @@ -1249,7 +1249,7 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { } }, .ecc_base =3D 0xf00000000ULL, - .ecc_version =3D 0x20000000, // version 0, implementation 2 + .ecc_version =3D 0x20000000, /* version 0, implementation 2 */ .nvram_machine_id =3D 0x72, .machine_id =3D ss20_id, .iommu_version =3D 0x13000000, @@ -1270,7 +1270,7 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { .dma_base =3D 0x78400000, .esp_base =3D 0x78800000, .le_base =3D 0x78c00000, - .apc_base =3D 0x71300000, // pmc + .apc_base =3D 0x71300000, /* pmc */ .aux1_base =3D 0x71900000, .aux2_base =3D 0x71910000, .nvram_machine_id =3D 0x80, @@ -1352,7 +1352,7 @@ static const struct sun4m_hwdef sun4m_hwdefs[] =3D { /* SPARCbook */ { .iommu_base =3D 0x10000000, - .tcx_base =3D 0x50000000, // XXX + .tcx_base =3D 0x50000000, /* XXX */ .slavio_base =3D 0x70000000, .ms_kb_base =3D 0x71000000, .serial_base =3D 0x71100000, --=20 2.26.3 From nobody Fri May 17 11:58:52 2024 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