From nobody Mon Apr 14 09:16:54 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738401443; cv=none;
d=zohomail.com; s=zohoarc;
b=lNzA6HYfcvvb4C06wgJN7PjrKkkffh7jSDx4p6QjmYwxl/ebMzUT5ycNnYtySS0YOdAeBW1Ljd9JenveoNu40ntidBFxO7veO2M3IbK/pVJMDKMNMG2EFTJn5jmYFByLGgpQkuGdMOrkghEkheoI5+4yI9QKu7Q75AtLGR/P2KQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738401443;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=qyqWIFSMh+oTSqypjVXjebXLGHkmeLQM4JJ2rEUUT8A=;
b=g82bEIQiXItCktLmNAfZ/O0n73vrb6M1++KDiMZs84nA27BNoXAN9WU6TXvJjGDRGOA85UjvFvRvO1GHhHaqJoqBjx8pJeuAfJF2G03BrG3Vw6lXQuqmRyhX6MX/i/92SyrttXPyM9sgoKJxAVkUD25WPP/ZkyS4LIN93h5i2Ko=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738401443449882.8771402580745;
Sat, 1 Feb 2025 01:17:23 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1te9bK-0000zb-On; Sat, 01 Feb 2025 04:15:42 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9bJ-0000yd-60
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:41 -0500
Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9bH-0000P1-KZ
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:40 -0500
Received: by mail-wr1-x42d.google.com with SMTP id
ffacd0b85a97d-385e27c75f4so2339216f8f.2
for <qemu-devel@nongnu.org>; Sat, 01 Feb 2025 01:15:39 -0800 (PST)
Received: from localhost.localdomain (232.170.88.92.rev.sfr.net.
[92.88.170.232]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-438dcc1317fsm118446185e9.8.2025.02.01.01.15.36
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sat, 01 Feb 2025 01:15:36 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738401337; x=1739006137; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=qyqWIFSMh+oTSqypjVXjebXLGHkmeLQM4JJ2rEUUT8A=;
b=CjDKko0HgNkFx5zto03ObMoh7zsOr8RTy1NDEgL6hx2aqmM4fz+40c2uf4E2tIMN7D
Rf/Aq06lAKuDgmJ81d2tpeltPhCT6CtdethGxnvh6eoI0+AkxYsyeFjw5LlrwlwEdrLP
ER+6VHvVnXgMq1d1rMe0rqjMGE0+7yU0xUCc/La0ZkceFNhdrt5BZTpsQ0bJW4DlM3lX
IldW9slGWhMaTgFJFj5bCXG2thj6eUwDdL9heJFU8VLmjhUVulqiF6FH8uGYf5va9MPX
jC3AWdvgDuiZchsT04j5l/CrL2LHPkGNXLJSdPrkrwUrpt3lVsuWtHGrlA3ERdUOkw2k
CjNA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738401337; x=1739006137;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=qyqWIFSMh+oTSqypjVXjebXLGHkmeLQM4JJ2rEUUT8A=;
b=iNcq6A36WASboSMMdiiZ3kIJwHIpOxDttgW9S9Blgh4EOYUGJzUKYTeoDRHYViWdfD
oy2vy1A43+ofUHuYNUOO7lRA7EtIL2v9tRCJ43+yiD1Ftgfc0yqzsaCl3mry5fktjsbq
zzY8l/e4Dp9danxBwzKMxUhyeYuekWdBRrgMSuqF6E6ufxMIUYjQ1MuyWYlibyi+Eo9N
eOmLJpsOC54eIRWqVzWxaiiGpa6kP4BQ6HCg4cXeyvyt8UKwUU50pStnihyJ/mS4gqcX
rurtMTioPHSr4l7R4DhdTL+s4FcpfXR00HFqVPvANIk3TUF7NIll2sZ0K456iKwobfKE
DoZg==
X-Gm-Message-State: AOJu0Yx/XzaHjES41PC/4GltPmzQ3kn5dscBTZZxMOepvcUNwc/d+TrP
rnyqltZzBvDHgY5osDfQcrZ1AJurIC7PdknRg+7wL/J6sK8gmkNP4i5LFlVpYP/5+fqNejO1MMB
U9Mg=
X-Gm-Gg: ASbGncvLknSH/Xep4qAcFDVN1ax2YsqdgGh7eS8iYOarwOsDvl2q13aDN8qJtkAiwPF
GQYx+1SScJRlrq+ZlJUNq3O/y0JCPLQVft1cfZKag9OzBE1FUARGJPgOKsEYiSb8WMsZv24AQXX
5cWo2AB36Mi37YZqAP8YqLIskKNxxIdEkOboG3W1AzgNgTTJpFMmUTB2flli7i16uhswx8CFssL
U86agwnP0VTzHH6mpzNg8z5jeJiwxT5G0W8RmvR/jqkMNqbjmgZMtyln+4/LUPL5D+U8y17ywn3
IOmrSApEC0HAUGOML+v4iZYc5VifCBxTQwPsO4CHYnLpp0/ZS12a5UVevNKJ/XDmTA==
X-Google-Smtp-Source:
AGHT+IG2OxupglZ3cehJnn/RZHJKbtWAcfx/Qo/TURAD8Hlr3lJZvTDvgCuuQME3intvFWXxvgw4bw==
X-Received: by 2002:a5d:6d86:0:b0:385:df43:2179 with SMTP id
ffacd0b85a97d-38c51967fd9mr10269078f8f.17.1738401337027;
Sat, 01 Feb 2025 01:15:37 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Jared Mauch <jared+home@puck.nether.net>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
devel@lists.libvirt.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 1/7] hw/arm/raspi4b: Declare machine types using
DEFINE_TYPES() macro
Date: Sat, 1 Feb 2025 10:15:22 +0100
Message-ID: <20250201091528.1177-2-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250201091528.1177-1-philmd@linaro.org>
References: <20250201091528.1177-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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=2a00:1450:4864:20::42d;
envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738401444519019000
When multiple QOM types are registered in the same file,
it is simpler to use the the DEFINE_TYPES() macro. Since
we are going to add more machines, convert type_init()
by DEFINE_TYPES().
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
hw/arm/raspi4b.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 1264e0d6eed..5c78d26f957 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -121,16 +121,13 @@ static void raspi4b_machine_class_init(ObjectClass *o=
c, void *data)
mc->init =3D raspi4b_machine_init;
}
=20
-static const TypeInfo raspi4b_machine_type =3D {
- .name =3D TYPE_RASPI4B_MACHINE,
- .parent =3D TYPE_RASPI_BASE_MACHINE,
- .instance_size =3D sizeof(Raspi4bMachineState),
- .class_init =3D raspi4b_machine_class_init,
+static const TypeInfo raspi4_machine_types[] =3D {
+ {
+ .name =3D TYPE_RASPI4B_MACHINE,
+ .parent =3D TYPE_RASPI_BASE_MACHINE,
+ .instance_size =3D sizeof(Raspi4bMachineState),
+ .class_init =3D raspi4b_machine_class_init,
+ },
};
=20
-static void raspi4b_machine_register_type(void)
-{
- type_register_static(&raspi4b_machine_type);
-}
-
-type_init(raspi4b_machine_register_type)
+DEFINE_TYPES(raspi4_machine_types)
--=20
2.47.1
From nobody Mon Apr 14 09:16:54 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates
8.43.85.245 as permitted sender) client-ip=8.43.85.245;
envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as
permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
mx.zohomail.com
with SMTPS id 1738401397539943.6031118686301;
Sat, 1 Feb 2025 01:16:37 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
id D148F1A88; Sat, 1 Feb 2025 04:16:36 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
by lists.libvirt.org (Postfix) with ESMTP id D62C11A48;
Sat, 1 Feb 2025 04:15:55 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
id 66DE71A93; Sat, 1 Feb 2025 04:15:52 -0500 (EST)
Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com
[209.85.221.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by lists.libvirt.org (Postfix) with ESMTPS id A5E371A92
for <devel@lists.libvirt.org>; Sat, 1 Feb 2025 04:15:43 -0500 (EST)
Received: by mail-wr1-f52.google.com with SMTP id
ffacd0b85a97d-385ddcfc97bso2157129f8f.1
for <devel@lists.libvirt.org>; Sat, 01 Feb 2025 01:15:43 -0800 (PST)
Received: from localhost.localdomain (232.170.88.92.rev.sfr.net.
[92.88.170.232])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-438dcc13151sm115999295e9.1.2025.02.01.01.15.41
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sat, 01 Feb 2025 01:15:42 -0800 (PST)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level:
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,
RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED,
RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738401342; x=1739006142;
darn=lists.libvirt.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=8SVQMLAYnWYkem+1LN8L06NityQ8o7wifm7JnMwf0uI=;
b=Y3CF3HRTAFsWYmy10IhpnavLHv9w4/F6vNYOr4bcnZ5cyiVSmeMwXekCiL3SisA/Zs
7mlnCy8pNFJLRfjj/iZrLavDYs9T5d5speo86welt8JVh3isrZvRaiEjmArnD9qecWh0
KFGDz3u16rTTZadRAbKdhnExKd6X8gQYIUC2CPiqrTlpBpy8zyyzekA2HExg1E18kQn/
KLBpc8sXyVqdVq+ztWS/O4KGu8wTc+jDAo3IW6u3XLTdTrTvd4W4eRNvnmH/TdXvHN+w
knKUGUkBBE6GNipycVgVgE8JP5Ww0I0ZUux6kUv2BPkUcW5qclxjECrH/7pZ9vzTLDUp
mY5A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738401342; x=1739006142;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=8SVQMLAYnWYkem+1LN8L06NityQ8o7wifm7JnMwf0uI=;
b=OTod5P3afUP+iSZY40cIo1UeOaR3JI75J9ck9apRbj+7+iWlA6p1CHyw5hRmcxxCKh
9lI8kVsnOgalMvJR+RX5JloudaSeOh8kXWD8S2ylWcVqUVeSxeAxdUb3ccZnlvX34t6n
6I+dhdwyLnrlKr1RfEwTW1kJKaNtjfVjxoB/29eIenKMpmT2O4OLhReu9y+c7kp333dm
slffwINigWNEViqe3bB1WT7fHe3kHbJbOqjSA1Pmva5UPQe14Wf3s5TvqRoQph4Gwqdy
k5WbQu84bNHXPbuK18pOJ7YwDU4+oamvIoi3IHStL8+RGg8ZHdJbwSuScM7ZI61FalBv
f6yQ==
X-Forwarded-Encrypted: i=1;
AJvYcCWxYebCwPQygjMdTylbFPNatmV+mNiQfpujYU5ynXMMQf0CZukt55xnEtrKR/77+bsK/e4sLQ==@lists.libvirt.org
X-Gm-Message-State: AOJu0YyRCqhXt9CNsqUddzlwZWs+iOVWcjIkqip0CyeAXzNKXsHKrUKZ
iO96QrHvmFlQeS79di/5bLjTLVQhrh+Fqar9o9AnjILGL51a2m65dN5B2jYg5mE=
X-Gm-Gg: ASbGnctHljTZQrFrnsuIUCBqUQG5mbcucPg4/Q4Q3unHM3JrN+6/jF0ZkHTNGHAgvjN
T2HK3xkMTMVRsASCfgP0mCy/teaSE4n0SFpPVgYMETZHgGUuNmCCqTFio2K84p7ldpPcEa7OW5T
duJvuV4S+byO30NNaTSZdK5K1wDjhgIn2flisTZRYkdxIVxvZzMHyXcjBXUQdgdFlVJdmFZpBak
pe2xAfXtuJ+sZRCGtRS9zVttgBtQSIhPS6AA9OpcJt+wVgv1poyPRweIrJvBhJRd0ZPjdRowp3g
qJ+OYVH2UIbbj9n0ixIkss0YDYHV2vHnGN4UUmmeq1knTB4tOSEcxdq2SVxXIGJKcA==
X-Google-Smtp-Source:
AGHT+IHRXnkkbk0ZZQ6tl39QprkH5MxX2Z/uA6l3tQp41XDzBDESwm20wCvmraMaIqfRDq30jGNxmw==
X-Received: by 2002:a5d:5583:0:b0:386:37f5:99e7 with SMTP id
ffacd0b85a97d-38c5196fd12mr9884961f8f.33.1738401342505;
Sat, 01 Feb 2025 01:15:42 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH 2/7] hw/arm/raspi4b: Introduce abstract raspi4-base machine
type
Date: Sat, 1 Feb 2025 10:15:23 +0100
Message-ID: <20250201091528.1177-3-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250201091528.1177-1-philmd@linaro.org>
References: <20250201091528.1177-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: 2TFLZMRCCSLMVUNT5MCHICVDHCB5ADJY
X-Message-ID-Hash: 2TFLZMRCCSLMVUNT5MCHICVDHCB5ADJY
X-MailFrom: philmd@linaro.org
X-Mailman-Rule-Hits: nonmember-moderation
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
loop; banned-address; member-moderation; header-match-config-1;
header-match-config-2; header-match-config-3;
header-match-devel.lists.libvirt.org-0
CC: Jared Mauch <jared+home@puck.nether.net>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
devel@lists.libvirt.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
<devel.lists.libvirt.org>
Archived-At:
<https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/2TFLZMRCCSLMVUNT5MCHICVDHCB5ADJY/>
List-Archive:
<https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1738401398316019000
Content-Type: text/plain; charset="utf-8"
In preparation of adding more machines based on the raspi4,
introduce TYPE_RASPI4_MACHINE. Remove TYPE_RASPI4B_MACHINE
definitions, declaring the machine name in place via the
MACHINE_TYPE_NAME("raspi4b") macro.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
hw/arm/raspi4b.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 5c78d26f957..548059f6d69 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -23,8 +23,8 @@
#include "hw/arm/bcm2838.h"
#include <libfdt.h>
=20
-#define TYPE_RASPI4B_MACHINE MACHINE_TYPE_NAME("raspi4b")
-OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4B_MACHINE)
+#define TYPE_RASPI4_MACHINE MACHINE_TYPE_NAME("raspi4-base")
+OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4_MACHINE)
=20
struct Raspi4bMachineState {
RaspiBaseMachineState parent_obj;
@@ -93,7 +93,7 @@ static void raspi4_modify_dtb(const struct arm_boot_info =
*info, void *fdt)
=20
static void raspi4b_machine_init(MachineState *machine)
{
- Raspi4bMachineState *s =3D RASPI4B_MACHINE(machine);
+ Raspi4bMachineState *s =3D RASPI4_MACHINE(machine);
RaspiBaseMachineState *s_base =3D RASPI_BASE_MACHINE(machine);
RaspiBaseMachineClass *mc =3D RASPI_BASE_MACHINE_GET_CLASS(machine);
BCM2838State *soc =3D &s->soc;
@@ -123,11 +123,15 @@ static void raspi4b_machine_class_init(ObjectClass *o=
c, void *data)
=20
static const TypeInfo raspi4_machine_types[] =3D {
{
- .name =3D TYPE_RASPI4B_MACHINE,
+ .name =3D MACHINE_TYPE_NAME("raspi4b"),
+ .parent =3D TYPE_RASPI4_MACHINE,
+ .class_init =3D raspi4b_machine_class_init,
+ }, {
+ .name =3D TYPE_RASPI4_MACHINE,
.parent =3D TYPE_RASPI_BASE_MACHINE,
.instance_size =3D sizeof(Raspi4bMachineState),
- .class_init =3D raspi4b_machine_class_init,
- },
+ .abstract =3D true,
+ }
};
=20
DEFINE_TYPES(raspi4_machine_types)
--=20
2.47.1
From nobody Mon Apr 14 09:16:54 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738401433; cv=none;
d=zohomail.com; s=zohoarc;
b=XfEhT6nlPxe5Yipl6BWA7I9kwdE8bKYqjkAsmWEBwaIwAxj70uMMBAtno0nATm6Ap4Knwf69pPJ+aRnB7I4LqLlUtjf9BHu37cLUZgNYdrVAkk3Ar6GQGpmjuMP8ht5McqzMR5vqE3MBTS+u7m0FKgIJGGBYsYiVSZMfs3PwP8o=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738401433;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=hEJr+KxKG+5t/x8q8wqYlKjB+Sy8stapfLkWTHUsQNw=;
b=T2WYUYHnHmHp4B5a1MTUVhsMAI1L2n1ZCwlAYP9UaboG6mTCPpZtepOR358FbIUFWDQQfa8GAtmKvqrkVYm5jYZ43hXp2vEOykepC3cADvjy7wz1WEkDdikqhhpTqqAvvzt1b3vGx6x/XCgcKJxeIqHGltD1m13ebngmaETIqUg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738401433900543.8936915559553;
Sat, 1 Feb 2025 01:17:13 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1te9bb-00012x-0q; Sat, 01 Feb 2025 04:15:59 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9bV-00011s-8R
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:56 -0500
Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9bT-0000bB-LD
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:15:53 -0500
Received: by mail-wm1-x32e.google.com with SMTP id
5b1f17b1804b1-436249df846so19297785e9.3
for <qemu-devel@nongnu.org>; Sat, 01 Feb 2025 01:15:51 -0800 (PST)
Received: from localhost.localdomain (232.170.88.92.rev.sfr.net.
[92.88.170.232]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-438dcc80e61sm118252725e9.34.2025.02.01.01.15.46
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sat, 01 Feb 2025 01:15:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738401350; x=1739006150; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=hEJr+KxKG+5t/x8q8wqYlKjB+Sy8stapfLkWTHUsQNw=;
b=cf8BDdDf/0SP9XvpiP+c5qJgNkvTn72kZHXN4IF5QDz9S2ypHpdyeNrCaCobVvRNtH
4sJqTtQsMOkTA/lXoBz+jhE70dpD5dXZE1d8upp79Th73IXxbfd4sfBKsIpxYhutQ0V9
jY3eSXFG6JNaqloHjFSM7LIxB3ia6ymbJFFChdKZxIYYWpcHN/EH1Rq0Z0sVaiVe5/32
cvo1cUjR9+vBaYAOwDYlcCVtxGLxBHlM6p6AGY/FHfnpsRkDpr8Goh//Jp0d/FaMb9OY
OWl0z+6eNgImJsn52x3OfO4w0XBwerejsgojD2wuJR3DGfkzVc4+gNCY4EpN5neLhUsQ
hpNA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738401350; x=1739006150;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=hEJr+KxKG+5t/x8q8wqYlKjB+Sy8stapfLkWTHUsQNw=;
b=hK1epMOXcYNr1kPsXGAVVEm/AN1YWExqElGav0Npw0ISdVepWtJLD3ISbXDyiJTLbk
5S/892HMvpfN1ORiXnWf89R79z+FwTmlu98ePQPamnXxLvjkbE0YNbH1LeAadgKCbzjb
ARdG4XAHXZLpkcNo2vEZ+q2qodPTJKxU1fh0fMqJmx8jPAAeFb1cMqlZ/9WtpFEVaVsH
zHXWf3AF1rtTNMCrH+aOW2pDyyR5ZHDEQcc3/Dx8OOUDrqKPHnrMnNm1ixsQ6URwsFct
JngXROQMrzxu0lceoXehSsaX0bA4IT/RvCyJUkFOHJkdN2jHayvJ+lB5L302cY+F6rH5
GYCA==
X-Gm-Message-State: AOJu0YwRuyqNrhNPhrmBd1AMnbPDmH8XFpPrTJlsD8leRR/MSO+2E7Yx
MzbZ63lobxszdjCrb/cnWI7pNeEraMiBfzQAL4pNju8/VV0JfG00Kr+OOT0KQkIHpF0CbvpiIku
cgUw=
X-Gm-Gg: ASbGncuNYUFIjxITm/4BbXtNzz5jZCAZb81H6neIZOHKnR3WQgvIn/p6TiQGDdTpRRw
3V/Vw0q5uQV8JEJO+Vs4LBFAUZdEtMNexN1lXvoVM9sRsEa0NPpTrHQkmFkFyoj5P22njslvZbl
fB1YyUYQp4K9Fz9kXJKgGzYqoHEc1pDGWy+Y40S6XDP8QFX1lxPMZ1mlWZQDmbwZH0TNUbAkznC
4HIv7ayYQR5SISOKclwyj/i704BA4y25WRhQkmVYR5mOrq3Y5Me8horr+OvHeKmXLSwjKRkhCXR
tATIT18Es1osfUEmdy51yUVQW6LfiCydzkLwIPbVbLWBCDcxMs9L9DWuZEvicVlbbw==
X-Google-Smtp-Source:
AGHT+IFtxTfKjyY3QOd9aKkfkjZ+Z4/R4gXLu9zWH0ZKWK+E9myYwk8LU+odVAo6pAQqYXWwPoqyQQ==
X-Received: by 2002:a05:600c:198b:b0:434:a7f1:6545 with SMTP id
5b1f17b1804b1-438dc429291mr112652585e9.27.1738401349784;
Sat, 01 Feb 2025 01:15:49 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Jared Mauch <jared+home@puck.nether.net>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
devel@lists.libvirt.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 3/7] hw/arm/raspi4b: Split raspi4b_machine_class_init() in two
(1g and 2g)
Date: Sat, 1 Feb 2025 10:15:24 +0100
Message-ID: <20250201091528.1177-4-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250201091528.1177-1-philmd@linaro.org>
References: <20250201091528.1177-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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=2a00:1450:4864:20::32e;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738401434438019000
Current raspi4b_machine_class_init() method register 2 distinct
machines, with different board revision (thus different memory
size), whether the host is 32-bit or more. Split it as 2 new
methods, one for the raspi4b with 1GB of memory (on 32-bit hosts)
and another for the raspi4b with 2GB of memory.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
hw/arm/raspi4b.c | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 548059f6d69..4ea79ec7092 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -107,26 +107,45 @@ static void raspi4b_machine_init(MachineState *machin=
e)
raspi_base_machine_init(machine, &soc->parent_obj);
}
=20
-static void raspi4b_machine_class_init(ObjectClass *oc, void *data)
+#if HOST_LONG_BITS =3D=3D 32
+static void raspi4b_1g_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc =3D MACHINE_CLASS(oc);
RaspiBaseMachineClass *rmc =3D RASPI_BASE_MACHINE_CLASS(oc);
=20
-#if HOST_LONG_BITS =3D=3D 32
rmc->board_rev =3D 0xa03111; /* Revision 1.1, 1 Gb RAM */
-#else
- rmc->board_rev =3D 0xb03115; /* Revision 1.5, 2 Gb RAM */
-#endif
+
raspi_machine_class_common_init(mc, rmc->board_rev);
mc->init =3D raspi4b_machine_init;
}
+#else
+static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc =3D MACHINE_CLASS(oc);
+ RaspiBaseMachineClass *rmc =3D RASPI_BASE_MACHINE_CLASS(oc);
+
+
+ rmc->board_rev =3D 0xb03115; /* Revision 1.5, 2 Gb RAM */
+ raspi_machine_class_common_init(mc, rmc->board_rev);
+ mc->init =3D raspi4b_machine_init;
+}
+#endif
=20
static const TypeInfo raspi4_machine_types[] =3D {
+#if HOST_LONG_BITS =3D=3D 32
{
.name =3D MACHINE_TYPE_NAME("raspi4b"),
.parent =3D TYPE_RASPI4_MACHINE,
- .class_init =3D raspi4b_machine_class_init,
- }, {
+ .class_init =3D raspi4b_1g_machine_class_init,
+ },
+#else
+ {
+ .name =3D MACHINE_TYPE_NAME("raspi4b"),
+ .parent =3D TYPE_RASPI4_MACHINE,
+ .class_init =3D raspi4b_2g_machine_class_init,
+ },
+#endif
+ {
.name =3D TYPE_RASPI4_MACHINE,
.parent =3D TYPE_RASPI_BASE_MACHINE,
.instance_size =3D sizeof(Raspi4bMachineState),
--=20
2.47.1
From nobody Mon Apr 14 09:16:54 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates
8.43.85.245 as permitted sender) client-ip=8.43.85.245;
envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as
permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
mx.zohomail.com
with SMTPS id 173840143700187.64468468569657;
Sat, 1 Feb 2025 01:17:17 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
id 534361C59; Sat, 1 Feb 2025 04:17:16 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
by lists.libvirt.org (Postfix) with ESMTP id E29FB1A53;
Sat, 1 Feb 2025 04:16:15 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
id 21D601C83; Sat, 1 Feb 2025 04:16:11 -0500 (EST)
Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com
[209.85.128.48])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by lists.libvirt.org (Postfix) with ESMTPS id A64531A74
for <devel@lists.libvirt.org>; Sat, 1 Feb 2025 04:15:56 -0500 (EST)
Received: by mail-wm1-f48.google.com with SMTP id
5b1f17b1804b1-436281c8a38so19998935e9.3
for <devel@lists.libvirt.org>; Sat, 01 Feb 2025 01:15:56 -0800 (PST)
Received: from localhost.localdomain (232.170.88.92.rev.sfr.net.
[92.88.170.232])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c5c1cf571sm6680720f8f.82.2025.02.01.01.15.54
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sat, 01 Feb 2025 01:15:55 -0800 (PST)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level:
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,
RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED,
RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738401355; x=1739006155;
darn=lists.libvirt.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=jNWPuDa8TGdgIkgMQ7fmGixmIo8d3RAnXJJCGYAmUDI=;
b=uLgR4aD/68y2yEGZ1mtH2D6pqYbr10d1YZb0yO1Q18Jfy/NbJdPqzxQV31yPhBCL7f
Q/ceKHqY/E/RNltkVtbysC221BC71RIqck+K94QezxGhCSZortnvjQ82a2Mtn668+UQF
g8jJUJO0z6U6pR7P+9+h9QtC6UBP1tcrM9hFDv5QokfpjCVXQfPQFtQRQegFFJlI/wUo
xdMJwkFXmLX7cRllFCTP+cqg6z5G3uGQ+mOYYs1KDKNYf11SxlXa9iWejjJWowrrdEmU
kXsPk1cWqPhbf2nGWD/kLcPq8HufLaVsbFN032WLBFc4zQftY5N/7GTa+w662XLhHU4k
rCSA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738401355; x=1739006155;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=jNWPuDa8TGdgIkgMQ7fmGixmIo8d3RAnXJJCGYAmUDI=;
b=QmJuFrg3e8XUHchbrU0CtYsMY2vEMiKAOg1D3LWTgRcU2HGPiIrqtU6zZ6XHgXRqBb
vAl9EjnCKNvqu6YfrCnTYldzyoBDCl64/rCtbD2Im11oDNe5HnFzB8m6+13Ro3sOvRpN
2/GPHY4qAck6+CdR9qLwJoZ2yMF5yifN7gJiDV/spDMti0F68MkFbAkmidiykU/jcMd1
ESUd5HiLW/B6gboasi/QmZZmrVpQjc5BOKVmhfwAavs8bUvlq4j7YbbLMl2KsbGC/uH2
q0Oy7Ceeg9Tfls70CS0ZflMdJwWurlZLTHMNY1vmJx5LM3skhM9Mp0GpgJKXh4H/glYi
awtg==
X-Forwarded-Encrypted: i=1;
AJvYcCUsUQwypVWtL6R55TRzbUgbR7d7AGTt7lXpGRTHCIjFeBDx9KQqDCA9kWHya+I3tTgMzQ05bQ==@lists.libvirt.org
X-Gm-Message-State: AOJu0YzhnLxqZTZMe1O85rM9o4xT955EQ+vcl1UvNKg9JQcSrhtd4Lr7
zGPlEo0lXhMl3PMYSxBitQFcIN8rvBCVJ2Z3svOWd85h9BeC6JBpuJIY18KDUo4=
X-Gm-Gg: ASbGncu2Zyzpp85bUJ97zKPLovldpRnklg5D6m/IHyV3BIVbrEzY4h1PUF+icLgCJ23
eDtQyls68xlTK+04ur/MO8xfbOp4wBVwQ2t93qnxGsEZK5UGrtYkoMv+NJ3RBJSdU+tifZFadoe
buQj31YMVBMTQeXfK7LyHZ63/p2GcHkcDB1aXsHlJldJGIWVaqUUnxn2TwrMrpF5ct1AT7dJ/+n
041nkH59EdyMDMfPegH9UNks0x6+SxYxqM/dqFUZ6vmsXsZI93LEoXnD1sy3W7yTbVetx+FnYBv
SAZnvImMZQumuneiEbCRJ2tQnccGpPd+Rve5dsU/73OInBAH8jpLacjz9xW6dMSx0Q==
X-Google-Smtp-Source:
AGHT+IFQ5mRPrNqZmR4MNd/zs6xiN8nBs8HG9i6hX1lK9EWJ5B0WpAmDDfMyOCn7THKQsBWb/bkU+A==
X-Received: by 2002:a05:600c:458a:b0:436:1c0c:bfb6 with SMTP id
5b1f17b1804b1-438dc40f2c7mr111656295e9.27.1738401355492;
Sat, 01 Feb 2025 01:15:55 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH 4/7] hw/arm/raspi4b: Rename as raspi4b-1g / raspi4b-2g,
deprecating old name
Date: Sat, 1 Feb 2025 10:15:25 +0100
Message-ID: <20250201091528.1177-5-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250201091528.1177-1-philmd@linaro.org>
References: <20250201091528.1177-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: XYQF6FZVMA7SDQ2GN2PA4RAAD3FGJWZ6
X-Message-ID-Hash: XYQF6FZVMA7SDQ2GN2PA4RAAD3FGJWZ6
X-MailFrom: philmd@linaro.org
X-Mailman-Rule-Hits: nonmember-moderation
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
loop; banned-address; member-moderation; header-match-config-1;
header-match-config-2; header-match-config-3;
header-match-devel.lists.libvirt.org-0
CC: Jared Mauch <jared+home@puck.nether.net>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
devel@lists.libvirt.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
<devel.lists.libvirt.org>
Archived-At:
<https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/XYQF6FZVMA7SDQ2GN2PA4RAAD3FGJWZ6/>
List-Archive:
<https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1738401438701019000
Content-Type: text/plain; charset="utf-8"
On 32-bit hosts, rename 'raspi4b' -> 'raspi4b-1g' to clarify the
machine has 1GB of RAM.
On 64-bit hosts, rename 'raspi4b' -> 'raspi4b-2g'.
Keep the 'raspi4b' alias but deprecate it.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
docs/about/deprecated.rst | 6 ++++++
hw/arm/raspi4b.c | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 4a3c302962a..d635bd60d74 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -257,6 +257,12 @@ Big-Endian variants of MicroBlaze ``petalogix-ml605`` =
and ``xlnx-zynqmp-pmu`` ma
Both ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` were added for little end=
ian
CPUs. Big endian support is not tested.
=20
+ARM ``raspi4b`` machine (since 10.0)
+''''''''''''''''''''''''''''''''''''
+
+This machine has been renamed ``raspi4b-1g`` on 32-bit hosts and ``raspi4b=
-2g``
+on 64-bit ones.
+
Backend options
---------------
=20
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 4ea79ec7092..713b4693a49 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -117,6 +117,7 @@ static void raspi4b_1g_machine_class_init(ObjectClass *=
oc, void *data)
=20
raspi_machine_class_common_init(mc, rmc->board_rev);
mc->init =3D raspi4b_machine_init;
+ mc->alias =3D "raspi4b";
}
#else
static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data)
@@ -128,19 +129,20 @@ static void raspi4b_2g_machine_class_init(ObjectClass=
*oc, void *data)
rmc->board_rev =3D 0xb03115; /* Revision 1.5, 2 Gb RAM */
raspi_machine_class_common_init(mc, rmc->board_rev);
mc->init =3D raspi4b_machine_init;
+ mc->alias =3D "raspi4b";
}
#endif
=20
static const TypeInfo raspi4_machine_types[] =3D {
#if HOST_LONG_BITS =3D=3D 32
{
- .name =3D MACHINE_TYPE_NAME("raspi4b"),
+ .name =3D MACHINE_TYPE_NAME("raspi4b-1g"),
.parent =3D TYPE_RASPI4_MACHINE,
.class_init =3D raspi4b_1g_machine_class_init,
},
#else
{
- .name =3D MACHINE_TYPE_NAME("raspi4b"),
+ .name =3D MACHINE_TYPE_NAME("raspi4b-2g"),
.parent =3D TYPE_RASPI4_MACHINE,
.class_init =3D raspi4b_2g_machine_class_init,
},
--=20
2.47.1
From nobody Mon Apr 14 09:16:54 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738401438; cv=none;
d=zohomail.com; s=zohoarc;
b=gsbsKupZADBiTTK0yI290W5fDIeZsUy8tgdfAVCH/kK98By28lqU5DKiCMdccFKnsxx7LcMzYFFHItj/Adi/KR2HYaP7+SYzf65IXLh3uGnpE+x8cjdF1d4jxpXLL75tU/dgjpEEyXmRiKYtfMSuVPKAGDUD4+0qqMSZldWujHQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738401438;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=h0KOfqY1jZzuDBLOoyIvqjDh4dLpYlCKlbjmZKCpncY=;
b=Gp73YIRYl9zO3J8iKzRpuSfETDCChiF4m0hAM6dhgs9HgsiueL4xBLD/1G+8gsfV4Q2SbXvvpFHU2Fl5tbT1qOIvNKuvw2WWH4EfeQ+otq0X6aET9eZEo8lbVrTkgRTIzbqXGmJzGADQtGKQgVyjpxcISmmEuHDgsUwrLSsQz7Y=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738401438161325.6191010186151;
Sat, 1 Feb 2025 01:17:18 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1te9bl-00014i-Aq; Sat, 01 Feb 2025 04:16:09 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9bg-00014C-As
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:05 -0500
Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9be-0000ja-U0
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:04 -0500
Received: by mail-wm1-x329.google.com with SMTP id
5b1f17b1804b1-436345cc17bso20846985e9.0
for <qemu-devel@nongnu.org>; Sat, 01 Feb 2025 01:16:02 -0800 (PST)
Received: from localhost.localdomain (232.170.88.92.rev.sfr.net.
[92.88.170.232]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c5c1b5a03sm6766496f8f.71.2025.02.01.01.15.59
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sat, 01 Feb 2025 01:16:00 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738401361; x=1739006161; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=h0KOfqY1jZzuDBLOoyIvqjDh4dLpYlCKlbjmZKCpncY=;
b=Cgql6/QtC1u95c6dcBjJqqWEKbAnv4ORmQ3frkiUrZR0T8c7PWXOVFh+FFbQI/D88U
8KHEv10VmerLvP83375WosyKQmHnfocIT8upHwV4dHWMACWHFwf4wYj/LhYogL/slVbN
/XGQXeylVD/eu0UkqMcdsQzeR5qiZShsQueEEUh+fA8KyakjrVY6nbgS+hVp7BPHJTsw
zkPbYtFbB+uHkJsBmZrqQ7bKbH9ggT4kQqv81Ok8q19gxr6a/pDMPNnx9970VKhsDaEO
PYCJEaX/u2t7E4BbQmzxud3eQh9zHSjY/5WD3/hfwFOTAoJYRFNMq7rn4rL1J2M1FlP6
ePXQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738401361; x=1739006161;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=h0KOfqY1jZzuDBLOoyIvqjDh4dLpYlCKlbjmZKCpncY=;
b=LoQOw+4Uz5kj3fB71qguTQ6bePdESPm1mUb8RdzMw3SRT8leJxS0qesuRiT2iph7Mx
cJhHu2WAdpnRowW56PibIJVjJB8G6N+xrPa+kAjSD6p4UWKFSU4hX/C0x40ARPzu+fmv
gutzN+vsi5d13J0GK8BRpaE3NSHOVC0iP0xlFLKezH8A/Ixsc8rgVGJI07R2POdv1obz
AfqOeKUDS6to6fP4/PXC2vD5L+ytuNPToUcx5iu9tSAJuOKrKrN1pVmDZwoq7Rd7Kl1g
nX8FA7y4JinG+kEBXr8oHiMmdwvQSHLoe851mUc/ZL0uAnff9abLKimbWgPrb9oTRHHY
XdeA==
X-Gm-Message-State: AOJu0YxUONHTxnvxCyWgTh2KbTisSjY4h587Rn+fgX9ABDTeCrrJwTI4
7nfJzsbjSOwy5RIeEyohEYOOgILGZHX/fNdB6cCBo0y6hROvaQAbaS+aY1PXVJ/qDy2NIrRsE/A
6Uzw=
X-Gm-Gg: ASbGncvLEiJYeDdyF/i7ETUrlVcAjo3VudUEePIqGeM5OCQWqmvSsYcglzKUVSj29Vv
BzfuRQ+YqJgLNLKde6b1bQ/za2HaxGPX/t3t1QiZd6Thv+eMaa5ch1YC7z5+7ruqeKdDcEmDTJD
gp2UZa6+YzhyEfVFkTFue3pQvgFnoC0bdeNi9vKwx6y8WRFf6kdci9mI5NHF7b8ko9mImcXXoRu
HdueAAqLjFIFwnbItxeC9aVXm/fBudu+JqYuz6Y9s4Yla+eDokQRjkXOerdn5AAe9V5Oe0nZrSo
xc/3PnPTv6OCXdr2vk9LRDTQF/6BVbG6f6l/W56lasGAEmK+Px7ry8IbK/YjEkdFVg==
X-Google-Smtp-Source:
AGHT+IHud876BMZ/APlo5xZ+MxstGyVHcTwcYW4a27I3C1chvn9bo3mAf/dbsNnCVUka3qigCD05hw==
X-Received: by 2002:a05:600c:154f:b0:434:a367:2bd9 with SMTP id
5b1f17b1804b1-438dc3ca79fmr141484875e9.14.1738401361073;
Sat, 01 Feb 2025 01:16:01 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Jared Mauch <jared+home@puck.nether.net>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
devel@lists.libvirt.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 5/7] hw/arm/raspi4b: Expose the raspi4b-1g machine on 64-bit
hosts
Date: Sat, 1 Feb 2025 10:15:26 +0100
Message-ID: <20250201091528.1177-6-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250201091528.1177-1-philmd@linaro.org>
References: <20250201091528.1177-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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=2a00:1450:4864:20::329;
envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738401440881019000
There is no particular reason to not have the raspi4b-1g machine
available on 64-bit hosts, so expose it there.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
hw/arm/raspi4b.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 713b4693a49..59b0d2ced44 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -107,7 +107,6 @@ static void raspi4b_machine_init(MachineState *machine)
raspi_base_machine_init(machine, &soc->parent_obj);
}
=20
-#if HOST_LONG_BITS =3D=3D 32
static void raspi4b_1g_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc =3D MACHINE_CLASS(oc);
@@ -117,9 +116,12 @@ static void raspi4b_1g_machine_class_init(ObjectClass =
*oc, void *data)
=20
raspi_machine_class_common_init(mc, rmc->board_rev);
mc->init =3D raspi4b_machine_init;
+#if HOST_LONG_BITS =3D=3D 32
mc->alias =3D "raspi4b";
+#endif
}
-#else
+
+#if HOST_LONG_BITS > 32
static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc =3D MACHINE_CLASS(oc);
@@ -131,22 +133,21 @@ static void raspi4b_2g_machine_class_init(ObjectClass=
*oc, void *data)
mc->init =3D raspi4b_machine_init;
mc->alias =3D "raspi4b";
}
-#endif
+#endif /* HOST_LONG_BITS > 32 */
=20
static const TypeInfo raspi4_machine_types[] =3D {
-#if HOST_LONG_BITS =3D=3D 32
{
.name =3D MACHINE_TYPE_NAME("raspi4b-1g"),
.parent =3D TYPE_RASPI4_MACHINE,
.class_init =3D raspi4b_1g_machine_class_init,
},
-#else
+#if HOST_LONG_BITS > 32
{
.name =3D MACHINE_TYPE_NAME("raspi4b-2g"),
.parent =3D TYPE_RASPI4_MACHINE,
.class_init =3D raspi4b_2g_machine_class_init,
},
-#endif
+#endif /* HOST_LONG_BITS > 32 */
{
.name =3D TYPE_RASPI4_MACHINE,
.parent =3D TYPE_RASPI_BASE_MACHINE,
--=20
2.47.1
From nobody Mon Apr 14 09:16:54 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738401431; cv=none;
d=zohomail.com; s=zohoarc;
b=GfnigUb/nBWrll6xtHuWaOjoqv/7kING18hymwmxHo8eTcCahevEQKHzQEnAG7Fjo5BmgQZK5dqXFc3llTNeW/K42Na5PIYrbJtoisEg6KPIOdrGiHVlxgI7l5EeIan/apnB27b0R1/parjZq4Pg03u/OlMdW8YbK43106MF2QU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738401431;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=T1LJZGDPBmQwNGoIT0EBNTzucOYXIeT9I+AbkFPx5nk=;
b=Z0lVTkQJuO0fYAOOjb+7ZLHppZbjC6A+hgMDQzHMVPUef9pxCAkM/+uJh281jHan16UYB3T145+1bR9Cc131tEqvYXAYn7aOm/6svCD0CK7c4VTiLm9ZbeXzUMWVKqVGYakqEt3kVmSZXMnBhQkAiESq8dMb8LTF33Gdh760MKQ=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738401431274555.2174681584669;
Sat, 1 Feb 2025 01:17:11 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1te9br-0001Bb-Qp; Sat, 01 Feb 2025 04:16:16 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9bm-00018A-8F
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:10 -0500
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9bk-0000ln-LK
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:09 -0500
Received: by mail-wm1-x32c.google.com with SMTP id
5b1f17b1804b1-436a39e4891so19347635e9.1
for <qemu-devel@nongnu.org>; Sat, 01 Feb 2025 01:16:08 -0800 (PST)
Received: from localhost.localdomain (232.170.88.92.rev.sfr.net.
[92.88.170.232]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38c5c102e51sm6925917f8f.31.2025.02.01.01.16.05
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sat, 01 Feb 2025 01:16:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738401367; x=1739006167; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=T1LJZGDPBmQwNGoIT0EBNTzucOYXIeT9I+AbkFPx5nk=;
b=q1cDpUPV2OKheBAMGMoyEK/KAsMYMLpDp8uQbc4y8iOERgIWhClB2Nf721hhjA369G
OKGIywXBoARe2j2FqHhuIJbGNJepOvse3V3BesQewZqCcM9/SONUTtqCMFth4TO1csY2
HKUbKpAtZyld1ONXIwXt7IpgtfVzKBz/3ToLx5H8R7i11sHDd1j+aQ8KPl9if2CnrfpL
z9kDGAS+oiPnHkC3hq3sAMrcZ9+60bZF8kjvCa4NkGtgu+8ujWZJsljsN2vuGNfb1AYe
ac+dnKW3kwsXeXb2H36afvT58VP2DlnSsa9pIDLKwKO7MAXlUdIUO2Oi88ZLFIAQKy57
eNfA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738401367; x=1739006167;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=T1LJZGDPBmQwNGoIT0EBNTzucOYXIeT9I+AbkFPx5nk=;
b=Iu3qoWai2qBpK3JozEhaGiLZN9Uj7b1mSacJ3PyRwfhklw0zdGPRgp3ZvlL2h7rs28
+Tur3oxlIVXLnZB6QVB6JxC15O6fwvWDzytPz7S4KoROck5Lgt6VZzOmsCjftB/HCKoK
xvjUmcUyyUbaj4Uwg7nNj5faNrUOwP0It8HYp/ZrDAm4dezugXflwBAt4YlxBuRL7MrF
GWRk+64XAnnINPzwpLh9VlaJ9daKtJJmmxxQg2/T5wxhwUXje7D+PpeXsfTsJP/oPrd2
9BVZllAAwSsDPVlI3OrEIpf7WjDK46KTChLeCjPL7cPBa5NTXmh1fWmfG5c0Eam3N6/Z
0OJA==
X-Gm-Message-State: AOJu0Yxy1GNmupn9PiV2vmQn744k8crkjGmK2RgS8KWOh0uktqlNUjWj
iHvCgoRHbBSrnUk4CkFU3lopONyMJHgED5fov6iW3sC1tWITV5dkDQVOE0rF5SXmRNmlnDZWidS
1t24=
X-Gm-Gg: ASbGncuRTtIuR6IEyZU9y5CcoCMwMlcVSSHngtrK7NhCGxPMT0HjcQ9CDGXh8BmkfH1
GJbZ7L2FRmT7UOBfbew0M2QtEf5nNhzhDh8vXrDBrm4EONRiVzqdZG7WVN5KJQwdWCFzKubiD4Y
AVIj5Qywh5XsaQPgwQ5Q5HGLh0bKH5AwCJxpqodgx5hQW8FAmGYD2aG9S4GXJbeuDm9PQSlubRP
bidgrLzJBhPwuPfO9jN0t64PmF5ltXNaYdnYqLrVH4MoJjd0xNnsgjXxzvTmcIXV15FB02q/i1P
d+SoalC5G4+6WVV2ckfk/lmXYoRO5S7l5PkbNhBqbS7RGj0GvE/6ssG2VQFDqT4LfA==
X-Google-Smtp-Source:
AGHT+IFdkWT1zY77Sr0yKYlBUWm23tzVHjnggZk5gWNKeKe00wI5idLZdjFwqy8r7vDk1ZvHszXZBA==
X-Received: by 2002:a5d:47a3:0:b0:38c:4a05:c25f with SMTP id
ffacd0b85a97d-38c5209605dmr11904138f8f.42.1738401366812;
Sat, 01 Feb 2025 01:16:06 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Jared Mauch <jared+home@puck.nether.net>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
devel@lists.libvirt.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 6/7] hw/arm/raspi4b: Add the raspi4b-4g machine
Date: Sat, 1 Feb 2025 10:15:27 +0100
Message-ID: <20250201091528.1177-7-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250201091528.1177-1-philmd@linaro.org>
References: <20250201091528.1177-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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=2a00:1450:4864:20::32c;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738401432404019000
Add the raspi4b-4g machine, a raspi4b rev1.4 with 4GB of RAM.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2797
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
hw/arm/raspi4b.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 59b0d2ced44..2cf8bc467c5 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -133,6 +133,17 @@ static void raspi4b_2g_machine_class_init(ObjectClass =
*oc, void *data)
mc->init =3D raspi4b_machine_init;
mc->alias =3D "raspi4b";
}
+
+static void raspi4b_4g_machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc =3D MACHINE_CLASS(oc);
+ RaspiBaseMachineClass *rmc =3D RASPI_BASE_MACHINE_CLASS(oc);
+
+
+ rmc->board_rev =3D 0xc03114; /* Revision 1.4, 4 GiB RAM */
+ raspi_machine_class_common_init(mc, rmc->board_rev);
+ mc->init =3D raspi4b_machine_init;
+}
#endif /* HOST_LONG_BITS > 32 */
=20
static const TypeInfo raspi4_machine_types[] =3D {
@@ -147,6 +158,11 @@ static const TypeInfo raspi4_machine_types[] =3D {
.parent =3D TYPE_RASPI4_MACHINE,
.class_init =3D raspi4b_2g_machine_class_init,
},
+ {
+ .name =3D MACHINE_TYPE_NAME("raspi4b-4g"),
+ .parent =3D TYPE_RASPI4_MACHINE,
+ .class_init =3D raspi4b_4g_machine_class_init,
+ },
#endif /* HOST_LONG_BITS > 32 */
{
.name =3D TYPE_RASPI4_MACHINE,
--=20
2.47.1
From nobody Mon Apr 14 09:16:54 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1738401407; cv=none;
d=zohomail.com; s=zohoarc;
b=H0+OPTqB08yrg0AoSNdzbcTBYoAMNisajqxmc2yzrn8DAqDZ35fx1pbGa65AnwaNG29+Ta7NG9COp6IFZcxoKRsI2vectsO/xZ3kAtD2sxzjeIjnCVAeum8goUgqgh94pVyeu9WWNuC3zFqhyRNQB18sOEdCQ/0mw7D6n/7cpDM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738401407;
h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=66gXMVjCY3cMcHioA5BCOH2x7vAMmwWjDCHfHbiYPrs=;
b=b4VbRb5vShFwxgVWUYWU1yFje3Kiz9IHQ/vdL8rS9Q5+uGoELX3vR+BSobydbyv2XS/PTX3xkLP/JVufB15HLPKfjKvdb7PiNNrTvvhdVMF0IC+bPu/w7/ZZ8JToaPhCAI8w5JY4lAih+RFNyJ4xX4vE738oClKP5CM/7FFbzBo=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1738401407549697.552767339788;
Sat, 1 Feb 2025 01:16:47 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1te9cB-0001Ha-Oq; Sat, 01 Feb 2025 04:16:36 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9bs-0001Da-Lr
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:16 -0500
Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1te9br-0000pt-4L
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 04:16:16 -0500
Received: by mail-wm1-x335.google.com with SMTP id
5b1f17b1804b1-436345cc17bso20847805e9.0
for <qemu-devel@nongnu.org>; Sat, 01 Feb 2025 01:16:14 -0800 (PST)
Received: from localhost.localdomain (232.170.88.92.rev.sfr.net.
[92.88.170.232]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-438e245f41esm81118335e9.36.2025.02.01.01.16.11
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Sat, 01 Feb 2025 01:16:12 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738401373; x=1739006173; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=66gXMVjCY3cMcHioA5BCOH2x7vAMmwWjDCHfHbiYPrs=;
b=d1wBjv914EzUUOthRM0pdrPZj1xkqzAzhGgUeCKWouWGbeQJMk553eQZfYFSZptbhx
VpP/k+xUIGP//7zrHQUX+A7P8WvavtIepX6n1V3LMHd3jvTB953jWTnIahKFO6V5jQpH
EtHSwqUxX393zCQ3pxgFyM4UKKOzLeMJUMheuP8Th5KLYfeQqMRG0b7DSQTaJrmpNPpt
VW1SD0kMiffbbOd6TTzqc0RnEbU59egJtH70P+q48YjMHOkZTSMzy9vnE7mEWQ1gvUEW
KHgg1xRF32Rzh6pwGqrhlQm8ssv8w1bMzZW565Esy1u1Mf7ag76qs0MQXga6iiVg7X7A
ddMg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738401373; x=1739006173;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=66gXMVjCY3cMcHioA5BCOH2x7vAMmwWjDCHfHbiYPrs=;
b=gi9uvaM2pEwju/IduQWG9bEcX+MRQZcyuqdqDQnLDJKwaE4koZdJMkoSJmlsKugp9z
3umWDjxAhvfF410Rk3J3OtUeVuHqaX2hDr08kLyAls7UhScd7y/j6Z7yMeobh4bWa4/K
CeyIrgQ4PSAFr3csBBTpGCjlmfhlM+A0rF/j3Yhs1gHJTlQyexXtdtB7c33sSnxBDEgu
hdh6G7SttOJyGoJkZaV1b8po2FCKJkonH4L5B9wHMcs7N0Y7rRuMWv3c3Y028kCr/3O2
MDmHymd51rz79IY//lGqXnJ7ju/7kuqpwoS/yEAKd++5bwLVA8dfw+zO+3OfRvLJbd1T
UeNQ==
X-Gm-Message-State: AOJu0Yyb3w/WD46x57ltZVzrCjR7sap4x6C3dX3/+vGbaicXmdlzt9Y1
zfVF8Spd33g+TMZHS83B5axiDMi/AUky9cbhDhv7aJ6u1z7s+Mzt4r9NdeSkoCMHDEzl29j0pLf
v3To=
X-Gm-Gg: ASbGncvUzd9OpFmmGnWFlYLMVNZTshDP0LZSJXuda/f1WEH8sM20fwNOboDfdvcqY9+
9ewAx1mEuccLbiz677DRsYLeUof9jZXTz5sHMDnkw6z6Fqbdmwo00Bh/kfMstC55Yc/bViTHXou
fHm0tuB7fwxLfgt03AtxKvkxvYl2MfsDAQ5aQrwTqyi5Kbhqwz/JVxU/8aY6WfWMey/FuVIrTCi
BI1cpX0yJSbCjSjjQqHjj1O7DfDJpWR/5l1UdBfGPiUWV51Qd2DgT2I/ZBL2VZ7t110dXLcJHkE
MMKufY0fwmcSstpBCTa//7ovPaxrce6xjftw31YB7A0C/YxeYX+y5XuezpbbW0p6zw==
X-Google-Smtp-Source:
AGHT+IHvIJ+me109i6CvqVMh7lj/yT3Vr5ofWpYkacnR+RWSGpiL4ih/G2vesJ7ey+rnjXuyHWJxOQ==
X-Received: by 2002:a05:600c:3511:b0:434:f3a1:b214 with SMTP id
5b1f17b1804b1-438dc41ef52mr105976065e9.28.1738401373022;
Sat, 01 Feb 2025 01:16:13 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Jared Mauch <jared+home@puck.nether.net>,
Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org,
devel@lists.libvirt.org,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 7/7] hw/arm/raspi4b: Add the raspi4b-8g machine
Date: Sat, 1 Feb 2025 10:15:28 +0100
Message-ID: <20250201091528.1177-8-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250201091528.1177-1-philmd@linaro.org>
References: <20250201091528.1177-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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=2a00:1450:4864:20::335;
envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, 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.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738401408768019000
Add the raspi4b-8g machine, a raspi4b rev1.5 with 8GB of RAM.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
hw/arm/raspi4b.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index 2cf8bc467c5..2120bc1a6f8 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -144,6 +144,17 @@ static void raspi4b_4g_machine_class_init(ObjectClass =
*oc, void *data)
raspi_machine_class_common_init(mc, rmc->board_rev);
mc->init =3D raspi4b_machine_init;
}
+
+static void raspi4b_8g_machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc =3D MACHINE_CLASS(oc);
+ RaspiBaseMachineClass *rmc =3D RASPI_BASE_MACHINE_CLASS(oc);
+
+
+ rmc->board_rev =3D 0xd03115; /* Revision 1.5, 8 GiB RAM */
+ raspi_machine_class_common_init(mc, rmc->board_rev);
+ mc->init =3D raspi4b_machine_init;
+}
#endif /* HOST_LONG_BITS > 32 */
=20
static const TypeInfo raspi4_machine_types[] =3D {
@@ -163,6 +174,11 @@ static const TypeInfo raspi4_machine_types[] =3D {
.parent =3D TYPE_RASPI4_MACHINE,
.class_init =3D raspi4b_4g_machine_class_init,
},
+ {
+ .name =3D MACHINE_TYPE_NAME("raspi4b-8g"),
+ .parent =3D TYPE_RASPI4_MACHINE,
+ .class_init =3D raspi4b_8g_machine_class_init,
+ },
#endif /* HOST_LONG_BITS > 32 */
{
.name =3D TYPE_RASPI4_MACHINE,
--=20
2.47.1