From nobody Mon May  5 07:06:58 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