From nobody Tue Feb 10 11:12:53 2026 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