Failed in applying to current master (
apply log)
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Yonggang Luo <luoyonggang@gmail.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Peter Xu <peterx@redhat.com>, David Hildenbrand <david@redhat.com>, "Cédric Le Goater" <clg@kaod.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>
docs/devel/testing/functional.rst | 3 ++
meson.build | 6 +--
include/hw/display/bcm2835_fb.h | 1 -
hw/display/bcm2835_fb.c | 1 +
hw/mips/malta.c | 2 +-
system/physmem.c | 4 +-
ui/vnc.c | 18 +++----
.gitlab-ci.d/buildtest-template.yml | 16 ++++--
.gitlab-ci.d/buildtest.yml | 4 +-
.gitlab-ci.d/crossbuild-template.yml | 4 +-
.gitlab-ci.d/custom-runners.yml | 2 +-
.gitlab-ci.d/windows.yml | 4 +-
tests/functional/aarch64/test_aspeed_ast2700.py | 8 ++-
tests/functional/arm/test_aspeed_ast1030.py | 12 ++---
tests/functional/arm/test_aspeed_ast2500.py | 8 +--
tests/functional/arm/test_aspeed_ast2600.py | 8 +--
tests/functional/m68k/test_nextcube.py | 3 +-
tests/functional/qemu_test/asset.py | 16 +++++-
tests/functional/qemu_test/cmd.py | 67 ++++++++++++++++++++-----
tests/functional/qemu_test/testcase.py | 14 ++++--
20 files changed, 137 insertions(+), 64 deletions(-)