From nobody Tue Feb 10 19:08:03 2026 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