On 1/2/25 10:15, Philippe Mathieu-Daudé wrote:
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é <phi...@linaro.org>
---
docs/about/deprecated.rst | 6 ++++++
hw/arm/raspi4b.c | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
static const TypeInfo raspi4_machine_types[] = {
#if HOST_LONG_BITS == 32
{
- .name = MACHINE_TYPE_NAME("raspi4b"),
+ .name = MACHINE_TYPE_NAME("raspi4b-1g"),
.parent = TYPE_RASPI4_MACHINE,
.class_init = raspi4b_1g_machine_class_init,
},
#else
{
- .name = MACHINE_TYPE_NAME("raspi4b"),
+ .name = MACHINE_TYPE_NAME("raspi4b-2g"),
.parent = TYPE_RASPI4_MACHINE,
.class_init = raspi4b_2g_machine_class_init,
},
Forgot to squash here:
-- >8 --
diff --git a/tests/functional/test_aarch64_raspi4.py
b/tests/functional/test_aarch64_raspi4.py
index 7a4302b0c5a..891a8135b6b 100755
--- a/tests/functional/test_aarch64_raspi4.py
+++ b/tests/functional/test_aarch64_raspi4.py
@@ -37 +37 @@ def test_arm_raspi4(self):
- self.set_machine('raspi4b')
+ self.set_machine('raspi4b-1g')
@@ -67 +67 @@ def test_arm_raspi4_initrd(self):
- self.set_machine('raspi4b')
+ self.set_machine('raspi4b-1g')
---
