MAINTAINERS | 6 +- docs/devel/submitting-a-patch.rst | 2 +- docs/system/target-i386-desc.rst.inc | 2 +- hw/s390x/s390-virtio-hcall.h | 2 + target/s390x/cpu_models.h | 15 -- hw/s390x/s390-stattrib.c | 1 + tests/qtest/aspeed_fsi-test.c | 20 +-- tests/qtest/cmsdk-apb-dualtimer-test.c | 2 +- tests/qtest/cmsdk-apb-watchdog-test.c | 2 +- tests/qtest/erst-test.c | 2 +- tests/qtest/ivshmem-test.c | 10 +- tests/qtest/libqos/ahci.c | 4 +- tests/qtest/microbit-test.c | 46 +++--- tests/qtest/sse-timer-test.c | 4 +- tests/qtest/stm32l4x5_exti-test.c | 138 +++++++++--------- tests/qtest/stm32l4x5_syscfg-test.c | 74 +++++----- tests/unit/test-nested-aio-poll.c | 7 - .gitlab-ci.d/buildtest.yml | 16 +-- .gitlab-ci.d/container-core.yml | 4 +- .travis.yml | 24 +--- tests/docker/dockerfiles/alpine.docker | 3 +- .../dockerfiles/{centos8.docker => centos9.docker} | 35 ++--- tests/docker/dockerfiles/debian-amd64-cross.docker | 3 +- tests/docker/dockerfiles/debian-arm64-cross.docker | 3 +- tests/docker/dockerfiles/debian-armel-cross.docker | 3 +- tests/docker/dockerfiles/debian-armhf-cross.docker | 3 +- tests/docker/dockerfiles/debian-i686-cross.docker | 3 +- .../dockerfiles/debian-mips64el-cross.docker | 3 +- .../docker/dockerfiles/debian-mipsel-cross.docker | 3 +- .../docker/dockerfiles/debian-ppc64el-cross.docker | 3 +- .../docker/dockerfiles/debian-riscv64-cross.docker | 3 +- tests/docker/dockerfiles/debian-s390x-cross.docker | 3 +- tests/docker/dockerfiles/debian.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 3 +- tests/docker/dockerfiles/fedora.docker | 1 + tests/docker/dockerfiles/opensuse-leap.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 157 --------------------- tests/docker/dockerfiles/ubuntu2204.docker | 1 + tests/lcitool/libvirt-ci | 2 +- tests/lcitool/mappings.yml | 20 --- tests/lcitool/refresh | 3 +- tests/vm/centos | 4 +- tests/vm/openbsd | 6 +- 43 files changed, 225 insertions(+), 423 deletions(-) rename tests/docker/dockerfiles/{centos8.docker => centos9.docker} (82%) delete mode 100644 tests/docker/dockerfiles/ubuntu2004.docker