From nobody Tue Apr 23 22:08:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620061992; cv=none; d=zohomail.com; s=zohoarc; b=RDixnGHmYhfkLTkciQbCV9xiv6kAxxELSvkmq4M8r+9XYmelE0iYdGtkUf5a6KFNFZSiDW0j/4gmINHSXT3EY0Fe4WJhBDkKUVmpEHX30zV67ltTyy7mOzTrcJlAXf0FSNMXp9p9zr9zLGegrISF4aOxsDSSqmJiHx1ASLL+UQg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620061992; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0/dStvpr9oyPCGk3CDC2TxGy21PRVsiBcyFEDxcgGiM=; b=cMlWpOKiHXkAI2tT19SXMWUfkckgWqjue5MPxoaQoy2eWE0cWeP8DQY5s2Ncc2FZhff191C/GCr+ENIzmLIVa7w1Oui+bRpKRwAcs1f1EaeaKr8zuqynYljh57V75iPMG8T+KSRWMlQo6K5TFWKEiB3DlhsO5YKjJw3tXXxyVFA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1620061992583938.59247372027; Mon, 3 May 2021 10:13:12 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso453391wmh.4 for ; Mon, 03 May 2021 10:13:11 -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 z19sm29920wmf.47.2021.05.03.10.13.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 10:13:10 -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=0/dStvpr9oyPCGk3CDC2TxGy21PRVsiBcyFEDxcgGiM=; b=I7sjXKHBoDNd58Rc9pkmfpqIxfjycdFz3g3/Yts6ROS8haeQJOgkWNgSTdywNEtcCq yXXfw7qGtEgDf/9pzbOSY57dXIlklgkmpDj0O4cBj8WdnwgUIzpaW+LIBxRSZ5Pk0rlp EKANl+/AbocktDlFEPmApckOaWh5OFGbCWTwSj232QToEdhyT60evbGSzI3ALO+JiR+7 qXMbWHyAJvFU+Eq8kI9KnZMjt683cTAKfXwwhC5kXSBf1uplUBgoiK+nEoDs6ob7iuzA PKRxQurOOnzHN3lnKyUSd9iJcoDNrzxaTaffZVP7MxqjTgZYH/jyGqrPUU3elCqiiGLn Gwzw== 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=0/dStvpr9oyPCGk3CDC2TxGy21PRVsiBcyFEDxcgGiM=; b=iMUyJS7DLudOEiLeOaEUQimnkWq75Giqe/9GjxbfcPEiCCIwynMXKjlda2DgzhdA0B QrTjArPpmXYrIxYIWMXe2UkTfb7fRmGWHXOwLbwm2Fp3X8FaqBMg5J1nMr7gPpOjnEFm DARwY/CCq0T83UxDPJ2oi9FqK3KKWjWQyuJOaVq0t/WkN8B1jfmGO4s5oPFaQLRZ78cF 3ZbhQ7XUVWorjucdQWOccc3FBfxkOIfDpFTCBkNysDu2oYmfXVuTwBkOL637VcYbBCLt eklmgfoDaoEYkoWUCTXSuHqGDcp/FSz6FlSejW5nmA42G6hCK7REufyCASWzdJxiH3oh dDmQ== X-Gm-Message-State: AOAM5324gSelLUoHCvECSXTX/hwtyyThTVrr1ue0GsiYHHLnp6fySFsP s4UhU5b75tN2Q3hVt39I3jM= X-Google-Smtp-Source: ABdhPJwPx5f9PMTB5heVu3KrpzBfxzCEN3DIXjQq3PXTAWtYNNOPYefdQETP8Jr0lFJaiVM/jKig/w== X-Received: by 2002:a7b:c5c1:: with SMTP id n1mr32636408wmk.83.1620061990781; Mon, 03 May 2021 10:13:10 -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?= , Richard Henderson Subject: [PATCH v3 1/6] hw/sparc/sun4m: Have sun4m machines inherit new TYPE_SUN4M_MACHINE Date: Mon, 3 May 2021 19:12:58 +0200 Message-Id: <20210503171303.822501-2-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) Introduce the TYPE_SUN4M_MACHINE and have all sun4m machines inherit it. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland --- 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 Tue Apr 23 22:08:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 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=1620061997; cv=none; d=zohomail.com; s=zohoarc; b=Z/0c3pAQ6nmUvLRci8stjsS2umNKUC1utACoYSwwFquc7tPRQEZypbcMeB3OzFO+1WXqdRQzX+lj01ZfUStyvq+nH9Gg3dLq4Kx+2dHAMEHBkqlFs9nMd7hCJ1wev95fKFUVKNMSWAkrz7FcIlcLpCHjgZwV8d/hLVsx43ALkVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620061997; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VPdZzCfQsm6/ozIPjoRVe3c1QnbIfhcKwFX9/UMIFzg=; b=JfD1MUq/PJpvS0bMq4+MjttzM93JAMKmPVjy6WEeZTcnUrrv2MbKCJK8MstnYArI3IXqruqfqgalyjWiKrbGvXZ9/yy97gmopKYtPr6uY9ZzUiYxNNeLr7HoPIKONmN53lTYzKz9rpgUPd2OtgLSa3WsqMK/3b0jVUPQa2TnSDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1620061997868820.0548965027479; Mon, 3 May 2021 10:13:17 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id t11-20020a05600c198bb02901476e13296aso3940313wmq.0 for ; Mon, 03 May 2021 10:13:17 -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 h14sm16225580wrq.45.2021.05.03.10.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 10:13:15 -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=VPdZzCfQsm6/ozIPjoRVe3c1QnbIfhcKwFX9/UMIFzg=; b=fut+/HAiqoODrUXgq/RoJrY1Xb/DiAF2MdM8xuG1aUNvDFNhoGBgylVZOp4IfNqAeN SczVnxT76GPHgQgT9Il9T9KLI0EjRinkOTnic/DdcjeoPnFqWZ2oEFPsxggSXJW1RW/w bW9BS03BQ7NXcAfMLqWN4YGqZwuaV7TaL4BH63CYWML7nqyIXR23nPzYO9HluWD95clm lW4mmoGSkU1+sZ94oAVUQB2ZFWdfqXhjNBDmOKrvsWk5vNGVXOnzemWUS5zJOiy48qV/ qyIt3BQ0m1L+N3tXs27pTKh1k8h7zmOeY7e8YaeHHmZpmdxe+xukzrHLeCmNDjAM3OUC KcSw== 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=VPdZzCfQsm6/ozIPjoRVe3c1QnbIfhcKwFX9/UMIFzg=; b=oBm7fYZbOYVzVfdDvGS+anl5gibYibkkQXM1CXhdZaJZxQ7Ggyn+LN+Fcz7PZ5FPil k657ZK3KLLU0eZK6f7s23UKaIyg/5J9iNTRc7l8uoI6rwc6dmiTcBGe8I9kWfsD9AHBK VxwRGB4a5pYPgS0uUmehV8q+4QT/5z41T7TxArzRrbhUDNTs2ZoxiZwDt3+cVIEvt/PF sbqH3ZqjSoAE12Bci5k/EBwl1prTi7uFyGQJvm72dEmG4KWOw0KP5tk70m5znPIi+SUc nrx9LaEAlCnTOV77JZ8cPTq345Gim9kt/D4/0ewXl/zc2FUmLRUro3qhFSBuumD3r0x7 DlBg== X-Gm-Message-State: AOAM533/q/luDu2SBnnN66So19F2S9BBvVU2o9zECF8MsGqlKoonBh8W inExKXU18/Vd46llAyy7/yRrw4PuU3R/XA== X-Google-Smtp-Source: ABdhPJzjmwHxxPWrArEC8OelNYvWINKtYlAQWqhK8d4KMbanyXfjp4gjZvi10qyaHxA1PlhcOWr13Q== X-Received: by 2002:a1c:f305:: with SMTP id q5mr33226011wmq.96.1620061996002; Mon, 03 May 2021 10:13:16 -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?= , Richard Henderson Subject: [PATCH v3 2/6] hw/sparc/sun4m: Introduce Sun4mMachineClass Date: Mon, 3 May 2021 19:12:59 +0200 Message-Id: <20210503171303.822501-3-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) Instead of passing the sun4m_hwdef structure via machine_init(), store it into the MachineClass. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland --- 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 Tue Apr 23 22:08:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620062002; cv=none; d=zohomail.com; s=zohoarc; b=UhqLCuqU5ph3G2mFfI0g/tU//iVxoCpsj/akgjImmU00wVt7/OlaxO05EhVHR1ywQd3C3Ykis6+zwtE9HnL60RqNTxvBqOIgtsvMnXj6jtzjhpgS4qTChsimg5PzDKxD1TxnP2pQjTvq2ET8XWdyJnJkqg9BziQOCMOOi9y7U9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620062002; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NSAUfhvZ8S+K3xT3LS2vCoaFcUxzcXCC2t65XqyqTdw=; b=iWDViAx3kCPPfYXBeAh7VY/jwU9JvDIyfd57FEJ0v7/6DuqLkXtY3OO2CCwDbcsno6FrL/O0i4aPhg0Dof5FTjN4yFVKIvtYIKtmqVEef9pcoqXAaJzAIBw4YDSuYgG5mfINAVRW5X++1Z6Lwb0uAQFSZuMVzytKVzlvcZoUFl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1620062002888374.9457829933731; Mon, 3 May 2021 10:13:22 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id x7so6370353wrw.10 for ; Mon, 03 May 2021 10:13:22 -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 a2sm9699733wrn.13.2021.05.03.10.13.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 10:13:20 -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=NSAUfhvZ8S+K3xT3LS2vCoaFcUxzcXCC2t65XqyqTdw=; b=H6GDBC4X4wjmY7GFvVGJz3aUZyrDxDM5gPJsZGDtai3t99ZY/t3EOGMUkQHL0RUdwU OSkdOuYuyBu400Bt1xnSGHu4zXd0kZq8pbp7gYVVTMyMiveLKXZFMrMmGuYzQBxLxaWr L9w24t7pXrpwkesc7Wwu2iTiA7BQ5CE3TCSj3sIVZ470h92mQngEW8mGv7CqK7wIKLcK N+9vRzAiW7raMQQB85pJB8etCfySSwT+XE7nYI9H5iOaTqxKyH0epBK8QpSlgrywx5mr FrUAhicBgZJ32rpanM/LQzuoo495yGkeTOBmAte3WaroXSVz3SU6zZezD8hwCtLHMW/F jc4w== 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=NSAUfhvZ8S+K3xT3LS2vCoaFcUxzcXCC2t65XqyqTdw=; b=IXuuMBO78iFBOPP5tliRti5s5BwmwElpEYih4uQf5nWO+OMWTGeC4rcNifaKncu3KJ lHPtOkx5ArSuryCUFA0HGwrRrG4W0arTuSZFrXz6r24SZsUkGHeTnLCWcu+WW0HVG2ib IUjvgGGfbbJ23UH0v0XUVN4PFUbcx7wujEi9Vrv48I94WhyECMwrORQv0BLrK9fAo3ke Y2KEPZWjRifJ2sc9ZaYy1jwWEvyWBseU0kCx4LsEQvvhpOdG0E3OS+XtDBNZ++YMquMh DCcRz/DyJ2yeoQ+WGbKcp9drfq9QbNYNb6hLBfaV6oLKm+nulbBuyOE9TpUymyiimJGz o5bQ== X-Gm-Message-State: AOAM533w86dJKQ3XfFZdFctii18xr41KoAG8k7bPP830CnetLrtNCgJa asuu3HefkjeExTyxp5z6dtA= X-Google-Smtp-Source: ABdhPJyhh7/gh/l1o0W5UuyE1IpMxhYcpiW0TiB4z1XD9ISiIiZTWbduLU6STLDiTywXTKrklCo1/w== X-Received: by 2002:adf:f190:: with SMTP id h16mr23352942wro.221.1620062001062; Mon, 03 May 2021 10:13:21 -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?= , Richard Henderson Subject: [PATCH v3 3/6] hw/sparc/sun4m: Factor out sun4m_machine_class_init() Date: Mon, 3 May 2021 19:13:00 +0200 Message-Id: <20210503171303.822501-4-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) Factor out the class_init code common to all machines to sun4m_machine_class_init(). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland --- 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 Tue Apr 23 22:08:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 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=1620062008; cv=none; d=zohomail.com; s=zohoarc; b=iWShFKzU+Zd4SLYKDjQgftfBFQNaT36bJahffQKA03t1XSrFeuSekXwKK4KMoWY7cAmBJU7xjfoQqaUj9z3WowYpPujkkDzDAEDr8PZzkVDAxNIvW+nf8acN3YcNA/IXzk4utjEG0OlLrMOHCU+asPQ5/4/qF/sF5aKXAUTkiFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620062008; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0dWVeeH1/VoY4ITl3jZ5D7j6w2KZsbQ1Q/ra2PImi8Q=; b=J7//4tTnLD6uD8KmxqNdvDXY0EoWxss8ZD4BRNjXGK1CoMzPi49p/Seq55FGCUtOF0ToDRk9yshi0L6fLkNF+G7CuZYxiMbGN7QB0wLXxdeMlNFlRazXJsQG0nNUOM7Zk682FqBGp/S3CFEN48P+qiuH+HQSVffJJosFqPQvghI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 162006200874916.54947972460195; Mon, 3 May 2021 10:13:28 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id j3-20020a05600c4843b02901484662c4ebso4501008wmo.0 for ; Mon, 03 May 2021 10:13:27 -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 g19sm146255wme.48.2021.05.03.10.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 10:13:25 -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=0dWVeeH1/VoY4ITl3jZ5D7j6w2KZsbQ1Q/ra2PImi8Q=; b=mVJUizJtvJxJwCH1y4OvYt1wlaNH5KJkY3QW9UWLfnSyrygSg21ZY4u5OkW1yH4eYl 5X4faN3hIrtkujJeEpDC61n4cfqru9XyTnEpmydMhJhjGOg2ALy2lmyxERDG/eo81XBr Nw5t9pUf9jb5wxTKHuIHc6a91tAYOwIYfXCq6LOlFWYz/1WurNkHDNwQBeReoFeEBWVn LJXgCGHlH8x0l7jIfe/sMUWkukpEsGVgoEmLJvEKhslMWUaSFCK4Alqd9R9jnYw28OlO 7yG597dnlBSTqkqVLKxG0FKG3hHl04JEY4uP4rxfLTTiZNMhEK4WkU9g+Tv4WOes/cgs z9SQ== 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=0dWVeeH1/VoY4ITl3jZ5D7j6w2KZsbQ1Q/ra2PImi8Q=; b=U19tJ43bun/CMRopgrzl34z4+iUBNTMbdVV1laO9BHMtdGBfqAxQD58PCp7Pbhua6m v8QHDkdvunw9LnnRhsbrq7Mj1Kmn+gxuCBgGF6vNufP5Eunyq9ROMNBaNYUgMP+Myrvm 86+0M3r6hLAnGsgIXjyQ+HYxJAn+YIwbjeLhfy5XZz9grVJB1XQyidLl7zc0gEWZzpek wc66kYz0DqBvUOUlHxwneAVmE3KU++dxPFEMg8bI9k2uGX+nuoEQ/22UTVhzM+GghI1f Cz3aivqcpyTVt8YcjdiG9O277mOJHq1yLP2iELc3mtKd33OgqJmBK3TjbplYAaGbmIt1 CblQ== X-Gm-Message-State: AOAM533mDLaRbpiDTxKgwHeqm9eAK3mlY01sODL684tBZxLzzUQE93vz oUapWd7hRfabCTdksCND3kU= X-Google-Smtp-Source: ABdhPJzPAew8Gja8ItJekPs8a+OTN3Vv35a/wStxffrRNVrF7rB8YAjemQppYmxNghy2xHIc6QY1/A== X-Received: by 2002:a1c:7fcd:: with SMTP id a196mr33636567wmd.180.1620062006007; Mon, 03 May 2021 10:13:26 -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?= , Richard Henderson Subject: [PATCH v3 4/6] hw/sparc/sun4m: Register machine types in sun4m_machine_types[] Date: Mon, 3 May 2021 19:13:01 +0200 Message-Id: <20210503171303.822501-5-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) Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland --- 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 Tue Apr 23 22:08:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620062013; cv=none; d=zohomail.com; s=zohoarc; b=OqLWNDVkCy8BNDXCPuYSutBMEW1fW2hVa43qT1XxdD5h+8EoBStXapI2ZqR1kYivh7dgP2ApCHhhZoAKCS2awMp2sswLVDfcLwmVXcg4KNAjnSTLwcYsE5fKTuoEPam89yBOWTko7Za+b+VBJXPB1IQYYQorFNfoEipeE4QCPTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620062013; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+FPJ9Qnru6OpVjKtqox8lDIug1vZ9yjVHlNfUoQamQA=; b=FzQC+/S+aXDOr4AMmmqq5de/UrFqAxS7LnK8S9Vh/BJ4L0SR6pezg8h5eLDXvxV7WxGafYxdG+4pS3d3Vfw+5SHTvhSpNKGucghVWFUJeUxa3RDNzoZrRbh5YEAYobBkRyuteahnSl1pWIeD91J4pqBW4hH3dfr54odw2iW2/Hc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1620062013185901.547220451091; Mon, 3 May 2021 10:13:33 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id j3-20020a05600c4843b02901484662c4ebso4501157wmo.0 for ; Mon, 03 May 2021 10:13:32 -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 k6sm32112wmi.42.2021.05.03.10.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 10:13:31 -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=+FPJ9Qnru6OpVjKtqox8lDIug1vZ9yjVHlNfUoQamQA=; b=LAFzYhwC+5t7tkrPfD9N4Xo0hWJxacNEKZAKdMdXq2Hznqz2fRHuWVkyddNlgWyz3I UsFVLTYoBH2YVyLnqHolFK/c2RS5PlWxHGEMMwb4NvzjZIHEPnh2gFJwqJzhRYjHxdeL Ie9QeBf/sjymb+vGag9+G9hPd/VB4UbTyK6tHerxXKPF6jVKI+6Fr3w2qFN2m8AsAHyI Y1b/Oh0PSWKKdx/+3+AyICI7+l4bpZlZmf/H2JQHRA0vGv45OqG6krWFrUGBfUX7d9VB f3kZ40ScvEjFa4Ht5k3g+D2b4AQc7U9j5GFqxsjm+pYhdT9UzEJrBZGKnFeu846mkfQR q11w== 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=+FPJ9Qnru6OpVjKtqox8lDIug1vZ9yjVHlNfUoQamQA=; b=n8rNoY1St9R4AZXSd0MXjh+v5CEDI5e02cOKWtZcSCjsQpzfSl+knhr900fCFFHLpg XFhZux6Xa1Rz/PVz27F1P0I5ckhhf9UPE4BI9ieswxFmAHT+0l61XQs0mlRhgszVi/iU mczpDTDC5OOkDU2MOO8sXJtQRKOm+kxjfwtMHaEDpUhiebO2WT8KAKe8nbfbsTDQI2nz W+bRUwb9B055id3K8PlO/W4Yy829bGdiQtK2AA5eK60BVWDiK8ZU3lFWRFm97Sl75zvv cHcLR2y51Vh8XeXnxpLbMCfKqwT/iy5zRA+Ehbhfbt0PYqGbOt+7wtJsteracMCeXUWK mSgA== X-Gm-Message-State: AOAM531u04CjO5+MQhZf625USACTyNj0GgzztsSwhBzUgGaYLgmcx8oo Fv2Rh+WKj4YpwlS6LLlZBjM= X-Google-Smtp-Source: ABdhPJwbrqzRfUzIX3wYDkD0MZ6hzdATVwinkEtzBiETnIxISM/0QmOqtcecvf56Bl+VNzikOxM2KQ== X-Received: by 2002:a7b:c1c5:: with SMTP id a5mr1781688wmj.63.1620062011467; Mon, 03 May 2021 10:13:31 -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?= , Richard Henderson Subject: [PATCH v3 5/6] hw/sparc/sun4m: Fix code style for checkpatch.pl Date: Mon, 3 May 2021 19:13:02 +0200 Message-Id: <20210503171303.822501-6-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) We are going to move this code, fix its style first. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland --- 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 Tue Apr 23 22:08:13 2024 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 Reviewed-by: Mark Cave-Ayland --- 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