Re: [PATCH] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
On Thu, 20 May 2021 at 13:07, Peter Maydell wrote: > > On Tue, 11 May 2021 at 04:25, Philippe Mathieu-Daudé wrote: > > > > Hi Peter, > > > > Can this patch go via your qemu-arm tree (it is reviewed)? > > Sure. > > Applied to target-arm.next, thanks. This breaks 'make check' because some bits of the test suite are still using the old machine names. The error message is a bit opaque: MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))} QTEST_QEMU_IMG=./qemu-img G_TEST_DBUS_DAEMON=/home/petmay01/linaro/qemu-from-laptop/qemu/tests/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-arm QTEST_QEMU_STORAGE_DAEMON_BINARY=./storage-daemon/qemu-storage-daemon tests/qtest/boot-serial-test --tap -k qemu-system-arm: -bios /tmp/qtest-boot-serial-c3pthL6: unsupported machine type Use -machine help to list supported machines socket_accept failed: Resource temporarily unavailable ** ERROR:../../tests/qtest/libqtest.c:319:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0) ERROR qtest-arm/boot-serial-test - Bail out! ERROR:../../tests/qtest/libqtest.c:319:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0) Makefile.mtest:80: recipe for target 'run-test-8' failed make: *** [run-test-8] Error 1 make: Leaving directory '/home/petmay01/linaro/qemu-from-laptop/qemu/build/arm-clang' "git grep raspi[23] tests" suggests there may be other uses beyond just the boot-serial-test one. Dropped. thanks -- PMM
Re: [PATCH] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
On Tue, 11 May 2021 at 04:25, Philippe Mathieu-Daudé wrote: > > Hi Peter, > > Can this patch go via your qemu-arm tree (it is reviewed)? Sure. Applied to target-arm.next, thanks. -- PMM
Re: [PATCH] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
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é > --- > 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); > }; >
Re: [PATCH] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
On a Monday in 2021, Philippe Mathieu-Daudé wrote: Remove the raspi2/raspi3 machine aliases, deprecated since commit 155e1c82ed0. Signed-off-by: Philippe Mathieu-Daudé --- docs/system/deprecated.rst | 7 --- docs/system/removed-features.rst | 7 +++ hw/arm/raspi.c | 2 -- 3 files changed, 7 insertions(+), 9 deletions(-) Reviewed-by: Ján Tomko Jano signature.asc Description: PGP signature
[PATCH] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases
Remove the raspi2/raspi3 machine aliases, deprecated since commit 155e1c82ed0. Signed-off-by: Philippe Mathieu-Daudé --- 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); }; -- 2.26.3