From nobody Wed Feb 11 02:14:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1620200375; cv=none; d=zohomail.com; s=zohoarc; b=D5wRooXgJp+CDOVcj0BX814J6CFT0SGVupLuU+MrqCP0Z6c4kE836pUtsahBKCM1FmcQDomN9tq09U9R92VTAo8rRzqCE4z6wAU2VvFKVAgOzVA6i3kXf0jdxP38rNsLi99Dk8ANn+/bSHucLMsbEx1LLUwf2eF0vwh3X/H2Ezo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620200375; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FBHrQNmb+xIXpOs+BIoP88NYO+ugyvHgdl9GtdnOCYU=; b=Q8tdr4eV9kKr7HFxvXGMj9qHhl6yvT+hPqeyPtPtN2GvdWcsaAQz+3rX6ieVfs/Sh+Srew39h1iBNR9A3FF46uqEhP2KFPRCX4EA/AZI/atq9BbenOMnobBRXsJbcb9fq6+VUwBQa9or6MgGx3ZN/QPfDJMRoEcO1wCOvOhmNJs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1620200375100139.6378193058904; Wed, 5 May 2021 00:39:35 -0700 (PDT) Received: from localhost ([::1]:44504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leC86-0004Mi-EB for importer@patchew.org; Wed, 05 May 2021 03:39:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leC4d-0007ds-G6 for qemu-devel@nongnu.org; Wed, 05 May 2021 03:35:59 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:57696 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leC4W-00027U-2h for qemu-devel@nongnu.org; Wed, 05 May 2021 03:35:59 -0400 Received: from host81-154-26-71.range81-154.btcentralplus.com ([81.154.26.71] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1leC4S-0000OI-MH; Wed, 05 May 2021 08:35:50 +0100 From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Wed, 5 May 2021 08:35:32 +0100 Message-Id: <20210505073538.11438-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210505073538.11438-1-mark.cave-ayland@ilande.co.uk> References: <20210505073538.11438-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 81.154.26.71 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 04/10] hw/sparc/sun4m: Register machine types in sun4m_machine_types[] X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Message-Id: <20210503171303.822501-5-f4bug@amsat.org> Signed-off-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 56f927e66c..a625c41cd3 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.20.1