Hi Peter, Can this patch go via your qemu-arm tree (it is reviewed)? On 5/3/21 12:57 PM, Philippe Mathieu-Daudé wrote: > Remove the raspi2/raspi3 machine aliases, > deprecated since commit 155e1c82ed0. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx> > --- > docs/system/deprecated.rst | 7 ------- > docs/system/removed-features.rst | 7 +++++++ > hw/arm/raspi.c | 2 -- > 3 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst > index 80cae862528..7895bd4d849 100644 > --- a/docs/system/deprecated.rst > +++ b/docs/system/deprecated.rst > @@ -238,13 +238,6 @@ this CPU is also deprecated. > System emulator machines > ------------------------ > > -Raspberry Pi ``raspi2`` and ``raspi3`` machines (since 5.2) > -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > - > -The Raspberry Pi machines come in various models (A, A+, B, B+). To be able > -to distinguish which model QEMU is implementing, the ``raspi2`` and ``raspi3`` > -machines have been renamed ``raspi2b`` and ``raspi3b``. > - > Device options > -------------- > > diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst > index 29e90601a51..8a8b8ca627b 100644 > --- a/docs/system/removed-features.rst > +++ b/docs/system/removed-features.rst > @@ -312,6 +312,13 @@ This machine has been renamed ``fuloong2e``. > These machine types were very old and likely could not be used for live > migration from old QEMU versions anymore. Use a newer machine type instead. > > +Raspberry Pi ``raspi2`` and ``raspi3`` machines (removed in 6.1) > +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > + > +The Raspberry Pi machines come in various models (A, A+, B, B+). To be able > +to distinguish which model QEMU is implementing, the ``raspi2`` and ``raspi3`` > +machines have been renamed ``raspi2b`` and ``raspi3b``. > + > > linux-user mode CPUs > -------------------- > diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c > index 990509d3852..20bba0316f1 100644 > --- a/hw/arm/raspi.c > +++ b/hw/arm/raspi.c > @@ -342,7 +342,6 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data) > MachineClass *mc = MACHINE_CLASS(oc); > RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc); > > - mc->alias = "raspi2"; > rmc->board_rev = 0xa21041; > raspi_machine_class_common_init(mc, rmc->board_rev); > }; > @@ -362,7 +361,6 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data) > MachineClass *mc = MACHINE_CLASS(oc); > RaspiMachineClass *rmc = RASPI_MACHINE_CLASS(oc); > > - mc->alias = "raspi3"; > rmc->board_rev = 0xa02082; > raspi_machine_class_common_init(mc, rmc->board_rev); > }; >
