Browse Source
* Improve detection of the docker/podman binary * Prevent a null pointer dereference during zpci hot unplug -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmmlgwQACgkQLtnXdP5w LbW4jw//VMx6pHEu5L3Rzr3FZdgMJUhJ3UQKoV5PAImHz96QjIZi3kR311/D7Xjr nPf9VVgVZUEKzwyCfv7V06M9S79Jbw2cJesEIcu5LqbvGxKcevXVPMdVPpDG7P7T zuNW7eyIMpHYHRnMnxRNY/Hl8S1P9spEWJeQpNxfe9AKoWh2i4vEC8KLMAf59DAw MX0CZjonMeCBSWBqRqP0zOeUqiq9n49Lz1LQnCZb1R2TF+RGmwfe6+NaBeEZ9BSg FWGVIIq09OFxvtUuuut5X47DOrxk69q0RmiLy+wyrpH3VMxWM41n3oensoaNm0Xj dg0Eq1GzQwnLalaVgdqriGnymQWtvKXmlXHsIAwedLscOO6F5L+T12WZUSUjDZ92 SGGKyi2TSkgEZO1naLxi+J0dMWSO51wOOln9GAgFHkT/PuF/12r0sVweXXiovucr 4CWKP8VGU5MVpGlZ9flLwXiq8uS1GOsMQbBj/eoVOxEuFnL0crX9dME8vlpoGYAg THmuLKOxtcVtC9BxBZQkMFj6IKdRYEfFnNuCl2gk33Ksdb9QYCyL54XSZ9vtvhhG +5ajjl+w+O8HgnQKdWSQy1PYrvQ6EXtY0ZOf0q0yPfz4oq4Ib81oLhfvK0AywM17 DALYymGpGgOgGYIkKQKcn3id7OnaIiRe7ai4GeJ9AbFVgxR4l+w= =Sdy4 -----END PGP SIGNATURE----- Merge tag 'pull-request-2026-03-02' of https://gitlab.com/thuth/qemu into staging * Remove qemu-system-microblazeel (qemu-system-microblaze can be used instead) * Improve detection of the docker/podman binary * Prevent a null pointer dereference during zpci hot unplug # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmmlgwQACgkQLtnXdP5w # LbW4jw//VMx6pHEu5L3Rzr3FZdgMJUhJ3UQKoV5PAImHz96QjIZi3kR311/D7Xjr # nPf9VVgVZUEKzwyCfv7V06M9S79Jbw2cJesEIcu5LqbvGxKcevXVPMdVPpDG7P7T # zuNW7eyIMpHYHRnMnxRNY/Hl8S1P9spEWJeQpNxfe9AKoWh2i4vEC8KLMAf59DAw # MX0CZjonMeCBSWBqRqP0zOeUqiq9n49Lz1LQnCZb1R2TF+RGmwfe6+NaBeEZ9BSg # FWGVIIq09OFxvtUuuut5X47DOrxk69q0RmiLy+wyrpH3VMxWM41n3oensoaNm0Xj # dg0Eq1GzQwnLalaVgdqriGnymQWtvKXmlXHsIAwedLscOO6F5L+T12WZUSUjDZ92 # SGGKyi2TSkgEZO1naLxi+J0dMWSO51wOOln9GAgFHkT/PuF/12r0sVweXXiovucr # 4CWKP8VGU5MVpGlZ9flLwXiq8uS1GOsMQbBj/eoVOxEuFnL0crX9dME8vlpoGYAg # THmuLKOxtcVtC9BxBZQkMFj6IKdRYEfFnNuCl2gk33Ksdb9QYCyL54XSZ9vtvhhG # +5ajjl+w+O8HgnQKdWSQy1PYrvQ6EXtY0ZOf0q0yPfz4oq4Ib81oLhfvK0AywM17 # DALYymGpGgOgGYIkKQKcn3id7OnaIiRe7ai4GeJ9AbFVgxR4l+w= # =Sdy4 # -----END PGP SIGNATURE----- # gpg: Signature made Mon Mar 2 12:31:00 2026 GMT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [undefined] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2026-03-02' of https://gitlab.com/thuth/qemu: gitlab: ensure docker output is always displayed in CI tests/docker: allow display of docker output tests/docker: add support for podman remote access tests/docker: improve handling of docker probes Remove the qemu-system-microblazeel target from the build gitlab-ci: Remove the microblazeel target from the CI jobs tests/qtest: Remove the microblazeel target from the qtests tests/functional: Remove the microblazeel test tests/functional: Make sure test case .py files are executable s390x/pci: prevent null pointer dereference during zpci hot unplug Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
Peter Maydell
4 weeks ago
22 changed files with 62 additions and 124 deletions
@ -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
|
|||
@ -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 |
|||
@ -1,5 +0,0 @@ |
|||
# SPDX-License-Identifier: GPL-2.0-or-later |
|||
|
|||
tests_microblazeel_system_thorough = [ |
|||
's3adsp1800' |
|||
] |
|||
@ -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() |
|||
Loading…
Reference in new issue