From: Thomas Huth <thuth@redhat.com> We are going to remove the microblazeel target, so the test is not required anymore. The little endian mode is tested already via the "microblaze" target, so we don't lose any test coverage here. While we're at it, simplify the "microblaze" target test now (in the file tests/functional/microblaze/test_s3adsp1800.py) since we don't need the separate super-class here anymore. Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/functional/meson.build | 1 - .../functional/microblaze/test_s3adsp1800.py | 23 +++------------- tests/functional/microblazeel/meson.build | 5 ---- .../microblazeel/test_s3adsp1800.py | 26 ------------------- 4 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 tests/functional/microblazeel/meson.build delete mode 100755 tests/functional/microblazeel/test_s3adsp1800.py diff --git a/tests/functional/meson.build b/tests/functional/meson.build index e1f5c0e7678..b979cff2b97 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -18,7 +18,6 @@ subdir('i386') subdir('loongarch64') subdir('m68k') subdir('microblaze') -subdir('microblazeel') subdir('mips') subdir('mipsel') subdir('mips64') diff --git a/tests/functional/microblaze/test_s3adsp1800.py b/tests/functional/microblaze/test_s3adsp1800.py index f093b162c0a..be78c208e3b 100755 --- a/tests/functional/microblaze/test_s3adsp1800.py +++ b/tests/functional/microblaze/test_s3adsp1800.py @@ -14,8 +14,6 @@ class MicroblazeMachine(QemuSystemTest): - timeout = 90 - ASSET_IMAGE_BE = Asset( ('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/' 'day17.tar.xz'), @@ -25,14 +23,12 @@ class MicroblazeMachine(QemuSystemTest): ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'), 'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22') - def do_ballerina_be_test(self, force_endianness=False): + def test_microblaze_s3adsp1800_big_endian(self): self.set_machine('petalogix-s3adsp1800') self.archive_extract(self.ASSET_IMAGE_BE) self.vm.set_console() self.vm.add_args('-kernel', self.scratch_file('day17', 'ballerina.bin')) - if force_endianness: - self.vm.add_args('-M', 'endianness=big') self.vm.launch() wait_for_console_pattern(self, 'This architecture does not have ' 'kernel memory protection') @@ -41,14 +37,13 @@ def do_ballerina_be_test(self, force_endianness=False): # message, that's why we don't test for a later string here. This # needs some investigation by a microblaze wizard one day... - def do_xmaton_le_test(self, force_endianness=False): + def test_microblaze_s3adsp1800_little_endian(self): self.require_netdev('user') self.set_machine('petalogix-s3adsp1800') self.archive_extract(self.ASSET_IMAGE_LE) self.vm.set_console() self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin')) - if force_endianness: - self.vm.add_args('-M', 'endianness=little') + self.vm.add_args('-M', 'endianness=little') tftproot = self.scratch_file('day13') self.vm.add_args('-nic', f'user,tftp={tftproot}') self.vm.launch() @@ -60,17 +55,5 @@ def do_xmaton_le_test(self, force_endianness=False): '821cd3cab8efd16ad6ee5acc3642a8ea') -class MicroblazeBigEndianMachine(MicroblazeMachine): - - ASSET_IMAGE_BE = MicroblazeMachine.ASSET_IMAGE_BE - ASSET_IMAGE_LE = MicroblazeMachine.ASSET_IMAGE_LE - - def test_microblaze_s3adsp1800_legacy_be(self): - self.do_ballerina_be_test() - - def test_microblaze_s3adsp1800_legacy_le(self): - self.do_xmaton_le_test(force_endianness=True) - - if __name__ == '__main__': QemuSystemTest.main() diff --git a/tests/functional/microblazeel/meson.build b/tests/functional/microblazeel/meson.build deleted file mode 100644 index 27619dc5a9a..00000000000 --- a/tests/functional/microblazeel/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -tests_microblazeel_system_thorough = [ - 's3adsp1800' -] diff --git a/tests/functional/microblazeel/test_s3adsp1800.py b/tests/functional/microblazeel/test_s3adsp1800.py deleted file mode 100755 index 75ce8856ed1..00000000000 --- a/tests/functional/microblazeel/test_s3adsp1800.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python3 -# -# Functional test that boots a microblaze Linux kernel and checks the console -# -# Copyright (c) 2018, 2021 Red Hat, Inc. -# -# This work is licensed under the terms of the GNU GPL, version 2 or -# later. See the COPYING file in the top-level directory. - -from microblaze.test_s3adsp1800 import MicroblazeMachine - - -class MicroblazeLittleEndianMachine(MicroblazeMachine): - - ASSET_IMAGE_LE = MicroblazeMachine.ASSET_IMAGE_LE - ASSET_IMAGE_BE = MicroblazeMachine.ASSET_IMAGE_BE - - def test_microblaze_s3adsp1800_legacy_le(self): - self.do_xmaton_le_test() - - def test_microblaze_s3adsp1800_legacy_be(self): - self.do_ballerina_be_test(force_endianness=True) - - -if __name__ == '__main__': - MicroblazeMachine.main() -- 2.53.0

From: Thomas Huth <thuth@redhat.com> It's been deprecated since two releases, so it should be fine to remove this now. Users can use the qemu-system-microblaze binary instead that can handle both endiannesses now. Signed-off-by: Thomas Huth <thuth@redhat.com> --- MAINTAINERS | 4 ++-- docs/about/deprecated.rst | 13 ------------- docs/about/removed-features.rst | 14 ++++++++++++++ configs/devices/microblazeel-softmmu/default.mak | 6 ------ configs/targets/microblazeel-softmmu.mak | 6 ------ qapi/machine.json | 2 +- tests/tcg/plugins/syscall.c | 1 - 7 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 configs/devices/microblazeel-softmmu/default.mak delete mode 100644 configs/targets/microblazeel-softmmu.mak diff --git a/MAINTAINERS b/MAINTAINERS index 233d2a5e71f..2af4b2c0887 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -286,7 +286,7 @@ F: target/microblaze/ F: hw/microblaze/ F: disas/microblaze.c F: tests/docker/dockerfiles/debian-microblaze-cross.d/build-toolchain.sh -F: tests/functional/microblaze*/meson.build +F: tests/functional/microblaze/ MIPS TCG CPUs M: Philippe Mathieu-Daudé <philmd@linaro.org> @@ -1422,7 +1422,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: hw/microblaze/petalogix_s3adsp1800_mmu.c F: include/hw/char/xilinx_uartlite.h -F: tests/functional/microblaze*/test_s3adsp1800.py +F: tests/functional/microblaze/test_s3adsp1800.py petalogix_ml605 M: Edgar E. Iglesias <edgar.iglesias@gmail.com> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 1d5c4f3707c..d0ce914d858 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -301,19 +301,6 @@ please write a mail to the qemu-devel mailing list). If you just want to boot a Cortex-A15 or Cortex-A9 Linux, use the ``virt`` machine instead. -System emulator binaries ------------------------- - -``qemu-system-microblazeel`` (since 10.1) -''''''''''''''''''''''''''''''''''''''''' - -The ``qemu-system-microblaze`` binary can emulate little-endian machines -now, too, so the separate binary ``qemu-system-microblazeel`` (with the -``el`` suffix) for little-endian targets is not required anymore. The -``petalogix-s3adsp1800`` machine can now be switched to little endian by -setting its ``endianness`` property to ``little``. - - Backend options --------------- diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 41bec8b8e38..c6ee20ff620 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1277,6 +1277,20 @@ The 'pvrdma' device and the whole RDMA subsystem have been removed. SD physical layer specification v2.00 supersedes the v1.10 one. + +System emulator binaries +------------------------ + +``qemu-system-microblazeel`` (removed in 11.0) +'''''''''''''''''''''''''''''''''''''''''''''' + +The ``qemu-system-microblaze`` binary can emulate little-endian machines +now, too, so the separate binary ``qemu-system-microblazeel`` (with the +``el`` suffix) for little-endian targets is not required anymore. The +``petalogix-s3adsp1800`` machine can now be switched to little endian by +setting its ``endianness`` property to ``little``. + + Related binaries ---------------- diff --git a/configs/devices/microblazeel-softmmu/default.mak b/configs/devices/microblazeel-softmmu/default.mak deleted file mode 100644 index 4c1086435bf..00000000000 --- a/configs/devices/microblazeel-softmmu/default.mak +++ /dev/null @@ -1,6 +0,0 @@ -# Default configuration for microblazeel-softmmu - -# Boards are selected by default, uncomment to keep out of the build. -# CONFIG_PETALOGIX_S3ADSP1800=n -# CONFIG_PETALOGIX_ML605=n -# CONFIG_XLNX_ZYNQMP_PMU=n diff --git a/configs/targets/microblazeel-softmmu.mak b/configs/targets/microblazeel-softmmu.mak deleted file mode 100644 index 52feb957b48..00000000000 --- a/configs/targets/microblazeel-softmmu.mak +++ /dev/null @@ -1,6 +0,0 @@ -TARGET_ARCH=microblaze -# needed by boot.c -TARGET_NEED_FDT=y -TARGET_XML_FILES=gdb-xml/microblaze-core.xml gdb-xml/microblaze-stack-protect.xml -TARGET_LONG_BITS=32 -TARGET_NOT_USING_LEGACY_LDST_PHYS_API=y diff --git a/qapi/machine.json b/qapi/machine.json index ef8575b6eb9..685e4e29b87 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -38,7 +38,7 @@ ## { 'enum' : 'SysEmuTarget', 'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'hexagon', 'hppa', 'i386', - 'loongarch64', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64', + 'loongarch64', 'm68k', 'microblaze', 'mips', 'mips64', 'mips64el', 'mipsel', 'or1k', 'ppc', 'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4', 'sh4eb', 'sparc', 'sparc64', 'tricore', diff --git a/tests/tcg/plugins/syscall.c b/tests/tcg/plugins/syscall.c index 5658f830879..624836dec62 100644 --- a/tests/tcg/plugins/syscall.c +++ b/tests/tcg/plugins/syscall.c @@ -40,7 +40,6 @@ static const struct SyscallInfo arch_syscall_info[] = { { "loongarch64", -1 }, { "m68k", 4 }, { "microblaze", 4 }, - { "microblazeel", 4 }, { "mips", 1 }, { "mips64", 1 }, { "mips64el", 1 }, -- 2.53.0