[PATCH] hw/arm/raspi: Remove deprecated raspi2/raspi3 aliases

[Peter Maydell]

On Thu, 20 May 2021 at 13:07, Peter Maydell <peter.maydell at linaro.org> wrote:
>
> On Tue, 11 May 2021 at 04:25, Philippe Mathieu-Daudé <f4bug at amsat.org> 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