fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

testing updates

Browse source 
- tweak .gitpublish base to origin/master
  - restore .gitmodules to qemu-project hosts
  - drop 64 bits guests from i686
  - update aarch64/s390x custom runners to 24.04
  - tweak gitlab-runner registration method
  - make check-venv dependency for functional tests
  - replace avocado's gdb support with pygdbmi
  - remove avocado dependencies from reverse_debug tests
  - ensure replay.bin doesn't loose events after SHUTDOWN_HOST_QMP
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmjk1K8ACgkQ+9DbCVqe
 KkSMAQf/X/vltf2njNMiBtlEh3H5j7RHFYs83V+UYa1m2DRSrx9B8dBDwTv+kqeh
 KRSnHMufdVuqKhaPAavvI4v4E1kqjjTy1U4YjjMA7zKPrTafJHGhI6QGiQ3i7vhA
 3/XTiqYhTJZfVFGDWlTkE8GbmTsT+mQVwt2BCoKjazibGVNWvRwUcWk81cNw/YI5
 e28dRbDCB+K03y+QVhyEOVBm59r0Qft0v3nLMq8+kGxW/Nh0oGKpuagWT2D24Tp0
 bEMlkcMJv20fVV9wd5f8NmAyMucczkt2vuLhghA/wUQveO0jBJwMxoMfgiGtlI1s
 iy1Q1iFx7bMEOeHO2fDQSvAfSXzvSw==
 =m/Gd
 -----END PGP SIGNATURE-----

Merge tag 'pull-10.2-maintainer-071025-1' of https://gitlab.com/stsquad/qemu into staging

testing updates

 - tweak .gitpublish base to origin/master
 - restore .gitmodules to qemu-project hosts
 - drop 64 bits guests from i686
 - update aarch64/s390x custom runners to 24.04
 - tweak gitlab-runner registration method
 - make check-venv dependency for functional tests
 - replace avocado's gdb support with pygdbmi
 - remove avocado dependencies from reverse_debug tests
 - ensure replay.bin doesn't loose events after SHUTDOWN_HOST_QMP

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAmjk1K8ACgkQ+9DbCVqe
# KkSMAQf/X/vltf2njNMiBtlEh3H5j7RHFYs83V+UYa1m2DRSrx9B8dBDwTv+kqeh
# KRSnHMufdVuqKhaPAavvI4v4E1kqjjTy1U4YjjMA7zKPrTafJHGhI6QGiQ3i7vhA
# 3/XTiqYhTJZfVFGDWlTkE8GbmTsT+mQVwt2BCoKjazibGVNWvRwUcWk81cNw/YI5
# e28dRbDCB+K03y+QVhyEOVBm59r0Qft0v3nLMq8+kGxW/Nh0oGKpuagWT2D24Tp0
# bEMlkcMJv20fVV9wd5f8NmAyMucczkt2vuLhghA/wUQveO0jBJwMxoMfgiGtlI1s
# iy1Q1iFx7bMEOeHO2fDQSvAfSXzvSw==
# =m/Gd
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 07 Oct 2025 01:51:59 AM PDT
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* tag 'pull-10.2-maintainer-071025-1' of https://gitlab.com/stsquad/qemu:
  record/replay: fix race condition on test_aarch64_reverse_debug
  tests/functional: Adapt arches to reverse_debugging w/o Avocado
  tests/functional: Adapt reverse_debugging to run w/o Avocado
  tests/functional: Add decorator to skip test on missing env vars
  tests/functional: drop datadrainer class in reverse debugging
  tests/functional: replace avocado process with subprocess
  tests/functional: Add GDB class
  tests/functional: Provide GDB to the functional tests
  python: Install pygdbmi in meson's venv
  tests/functional: Re-activate the check-venv target
  scripts/ci: use recommended registration command
  gitlab: move custom runners to Ubuntu 24.04
  tests/lcitool: bump custom runner packages to Ubuntu 24.04
  tests/lcitool: drop 64 bit guests from i686 cross build
  .gitmodules: restore qemu-project mirror of u-boot-sam460ex
  .gitmodules: restore qemu-project mirror of u-boot
  .gitpublish: use origin/master as default base

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2025-10-07 08:46:28 -07:00
commit 37ad0e48e9
27 changed files with 289 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.d/custom-runners.yml
View file

@ -29,6 +29,6 @@
junit: build/meson-logs/*.junit.xml junit: build/meson-logs/*.junit.xml
include: include:
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml'
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml'
- local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml' - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml'

8
.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml → .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
View file

@ -1,13 +1,13 @@
# All ubuntu-22.04 jobs should run successfully in an environment # All ubuntu-24.04 jobs should run successfully in an environment
# setup by the scripts/ci/setup/ubuntu/build-environment.yml task # setup by the scripts/ci/setup/ubuntu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 22.04" # "Install basic packages to build QEMU on Ubuntu 24.04"
ubuntu-22.04-aarch32-all: ubuntu-24.04-aarch32-all:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- aarch32 - aarch32
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'

32
.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml → .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml
View file

@ -1,13 +1,13 @@
# All ubuntu-22.04 jobs should run successfully in an environment # All ubuntu-24.04 jobs should run successfully in an environment
# setup by the scripts/ci/setup/ubuntu/build-environment.yml task # setup by the scripts/ci/setup/ubuntu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 22.04" # "Install basic packages to build QEMU on Ubuntu 24.04"
ubuntu-22.04-aarch64-all-linux-static: ubuntu-24.04-aarch64-all-linux-static:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -23,12 +23,12 @@ ubuntu-22.04-aarch64-all-linux-static:
- make check-tcg - make check-tcg
- make --output-sync -j`nproc --ignore=40` check - make --output-sync -j`nproc --ignore=40` check
ubuntu-22.04-aarch64-all: ubuntu-24.04-aarch64-all:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -45,12 +45,12 @@ ubuntu-22.04-aarch64-all:
- make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check - make --output-sync -j`nproc --ignore=40` check
ubuntu-22.04-aarch64-without-defaults: ubuntu-24.04-aarch64-without-defaults:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -67,12 +67,12 @@ ubuntu-22.04-aarch64-without-defaults:
- make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check - make --output-sync -j`nproc --ignore=40` check
ubuntu-22.04-aarch64-alldbg: ubuntu-24.04-aarch64-alldbg:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -86,12 +86,12 @@ ubuntu-22.04-aarch64-alldbg:
- make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check - make --output-sync -j`nproc --ignore=40` check
ubuntu-22.04-aarch64-clang: ubuntu-24.04-aarch64-clang:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -108,11 +108,11 @@ ubuntu-22.04-aarch64-clang:
- make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40`
- make --output-sync -j`nproc --ignore=40` check - make --output-sync -j`nproc --ignore=40` check
ubuntu-22.04-aarch64-tci: ubuntu-24.04-aarch64-tci:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -128,12 +128,12 @@ ubuntu-22.04-aarch64-tci:
|| { cat config.log meson-logs/meson-log.txt; exit 1; } || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40`
ubuntu-22.04-aarch64-notcg: ubuntu-24.04-aarch64-notcg:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- aarch64 - aarch64
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'

28
.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml → .gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml
View file

@ -1,13 +1,13 @@
# All ubuntu-22.04 jobs should run successfully in an environment # All ubuntu-24.04 jobs should run successfully in an environment
# setup by the scripts/ci/setup/ubuntu/build-environment.yml task # setup by the scripts/ci/setup/ubuntu/build-environment.yml task
# "Install basic packages to build QEMU on Ubuntu 22.04" # "Install basic packages to build QEMU on Ubuntu 24.04"
ubuntu-22.04-s390x-all-linux: ubuntu-24.04-s390x-all-linux:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -21,12 +21,12 @@ ubuntu-22.04-s390x-all-linux:
- make --output-sync check-tcg - make --output-sync check-tcg
- make --output-sync -j`nproc` check - make --output-sync -j`nproc` check
ubuntu-22.04-s390x-all-system: ubuntu-24.04-s390x-all-system:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- s390x - s390x
timeout: 75m timeout: 75m
rules: rules:
@ -42,12 +42,12 @@ ubuntu-22.04-s390x-all-system:
- make --output-sync -j`nproc` - make --output-sync -j`nproc`
- make --output-sync -j`nproc` check - make --output-sync -j`nproc` check
ubuntu-22.04-s390x-alldbg: ubuntu-24.04-s390x-alldbg:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -65,12 +65,12 @@ ubuntu-22.04-s390x-alldbg:
- make --output-sync -j`nproc` - make --output-sync -j`nproc`
- make --output-sync -j`nproc` check - make --output-sync -j`nproc` check
ubuntu-22.04-s390x-clang: ubuntu-24.04-s390x-clang:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -87,11 +87,11 @@ ubuntu-22.04-s390x-clang:
- make --output-sync -j`nproc` - make --output-sync -j`nproc`
- make --output-sync -j`nproc` check - make --output-sync -j`nproc` check
ubuntu-22.04-s390x-tci: ubuntu-24.04-s390x-tci:
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -107,12 +107,12 @@ ubuntu-22.04-s390x-tci:
|| { cat config.log meson-logs/meson-log.txt; exit 1; } || { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc` - make --output-sync -j`nproc`
ubuntu-22.04-s390x-notcg: ubuntu-24.04-s390x-notcg:
extends: .custom_runner_template extends: .custom_runner_template
needs: [] needs: []
stage: build stage: build
tags: tags:
- ubuntu_22.04 - ubuntu_24.04
- s390x - s390x
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'

6
.gitmodules vendored
View file

@ -15,7 +15,8 @@
url = https://gitlab.com/qemu-project/qemu-palcode.git url = https://gitlab.com/qemu-project/qemu-palcode.git
[submodule "roms/u-boot"] [submodule "roms/u-boot"]
path = roms/u-boot path = roms/u-boot
url = https://gitlab.com/qemu-project-mirrors/u-boot.git # upstream is https://github.com/u-boot/u-boot
url = https://gitlab.com/qemu-project/u-boot.git
[submodule "roms/skiboot"] [submodule "roms/skiboot"]
path = roms/skiboot path = roms/skiboot
url = https://gitlab.com/qemu-project/skiboot.git url = https://gitlab.com/qemu-project/skiboot.git
@ -27,7 +28,8 @@
url = https://gitlab.com/qemu-project/seabios-hppa.git url = https://gitlab.com/qemu-project/seabios-hppa.git
[submodule "roms/u-boot-sam460ex"] [submodule "roms/u-boot-sam460ex"]
path = roms/u-boot-sam460ex path = roms/u-boot-sam460ex
url = https://gitlab.com/qemu-project-mirrors/u-boot-sam460ex.git # upstream is https://github.com/zbalaton/u-boot-sam460ex
url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
[submodule "roms/edk2"] [submodule "roms/edk2"]
path = roms/edk2 path = roms/edk2
url = https://gitlab.com/qemu-project/edk2.git url = https://gitlab.com/qemu-project/edk2.git

16
.gitpublish
View file

@ -4,48 +4,48 @@
# See https://github.com/stefanha/git-publish for more information # See https://github.com/stefanha/git-publish for more information
# #
[gitpublishprofile "default"] [gitpublishprofile "default"]
base = master base = origin/master
to = qemu-devel@nongnu.org to = qemu-devel@nongnu.org
cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
[gitpublishprofile "rfc"] [gitpublishprofile "rfc"]
base = master base = origin/master
prefix = RFC PATCH prefix = RFC PATCH
to = qemu-devel@nongnu.org to = qemu-devel@nongnu.org
cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
[gitpublishprofile "stable"] [gitpublishprofile "stable"]
base = master base = origin/master
to = qemu-devel@nongnu.org to = qemu-devel@nongnu.org
cc = qemu-stable@nongnu.org cc = qemu-stable@nongnu.org
cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
[gitpublishprofile "trivial"] [gitpublishprofile "trivial"]
base = master base = origin/master
to = qemu-devel@nongnu.org to = qemu-devel@nongnu.org
cc = qemu-trivial@nongnu.org cc = qemu-trivial@nongnu.org
cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
[gitpublishprofile "block"] [gitpublishprofile "block"]
base = master base = origin/master
to = qemu-devel@nongnu.org to = qemu-devel@nongnu.org
cc = qemu-block@nongnu.org cc = qemu-block@nongnu.org
cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
[gitpublishprofile "arm"] [gitpublishprofile "arm"]
base = master base = origin/master
to = qemu-devel@nongnu.org to = qemu-devel@nongnu.org
cc = qemu-arm@nongnu.org cc = qemu-arm@nongnu.org
cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
[gitpublishprofile "s390"] [gitpublishprofile "s390"]
base = master base = origin/master
to = qemu-devel@nongnu.org to = qemu-devel@nongnu.org
cc = qemu-s390@nongnu.org cc = qemu-s390@nongnu.org
cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
[gitpublishprofile "ppc"] [gitpublishprofile "ppc"]
base = master base = origin/master
to = qemu-devel@nongnu.org to = qemu-devel@nongnu.org
cc = qemu-ppc@nongnu.org cc = qemu-ppc@nongnu.org
cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null

2
configure vendored
View file

@ -2003,6 +2003,8 @@ if test "$skip_meson" = no; then
test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE"
test "$plugins" = yes && meson_option_add "-Dplugins=true" test "$plugins" = yes && meson_option_add "-Dplugins=true"
test "$tcg" != enabled && meson_option_add "-Dtcg=$tcg" test "$tcg" != enabled && meson_option_add "-Dtcg=$tcg"
test -n "$gdb_bin" && meson_option_add "-Dgdb=$gdb_bin"
run_meson() { run_meson() {
NINJA=$ninja $meson setup "$@" "$PWD" "$source_path" NINJA=$ninja $meson setup "$@" "$PWD" "$source_path"
} }

2
meson_options.txt
View file

@ -36,6 +36,8 @@ option('trace_file', type: 'string', value: 'trace',
option('coroutine_backend', type: 'combo', option('coroutine_backend', type: 'combo',
choices: ['ucontext', 'sigaltstack', 'windows', 'wasm', 'auto'], choices: ['ucontext', 'sigaltstack', 'windows', 'wasm', 'auto'],
value: 'auto', description: 'coroutine backend to use') value: 'auto', description: 'coroutine backend to use')
option('gdb', type: 'string', value: '',
description: 'Path to GDB')
# Everything else can be set via --enable/--disable-* option # Everything else can be set via --enable/--disable-* option
# on the configure script command line. After adding an option # on the configure script command line. After adding an option

1
pythondeps.toml
View file

@ -33,3 +33,4 @@ sphinx_rtd_theme = { accepted = ">=0.5", installed = "1.2.2" }
[testdeps] [testdeps]
qemu.qmp = { accepted = ">=0.0.3", installed = "0.0.3" } qemu.qmp = { accepted = ">=0.0.3", installed = "0.0.3" }
pygdbmi = { accepted = ">=0.11.0.0", installed = "0.11.0.0" }

2
replay/replay.c
View file

@ -263,6 +263,8 @@ bool replay_has_interrupt(void)
void replay_shutdown_request(ShutdownCause cause) void replay_shutdown_request(ShutdownCause cause)
{ {
replay_save_instructions();
if (replay_mode == REPLAY_MODE_RECORD) { if (replay_mode == REPLAY_MODE_RECORD) {
g_assert(replay_mutex_locked()); g_assert(replay_mutex_locked());
replay_put_event(EVENT_SHUTDOWN + cause); replay_put_event(EVENT_SHUTDOWN + cause);

12
scripts/ci/setup/gitlab-runner.yml
View file

@ -16,7 +16,7 @@
tasks: tasks:
- debug: - debug:
msg: 'Checking for a valid GitLab registration token' msg: 'Checking for a valid GitLab registration token'
failed_when: "gitlab_runner_registration_token == 'PLEASE_PROVIDE_A_VALID_TOKEN'" failed_when: "gitlab_runner_authentication_token == 'PLEASE_PROVIDE_A_VALID_TOKEN'"
- name: Create a group for the gitlab-runner service - name: Create a group for the gitlab-runner service
group: group:
@ -95,15 +95,7 @@
# Register Runners # Register Runners
- name: Register the gitlab-runner - name: Register the gitlab-runner
command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'" command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --token {{ gitlab_runner_authentication_token }} --executor shell"
# The secondary runner will still run under the single gitlab-runner service
- name: Register secondary gitlab-runner
command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"
when:
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['architecture'] == 'aarch64'
- ansible_facts['distribution_version'] == '22.04'
- name: Install the gitlab-runner service using its own functionality - name: Install the gitlab-runner service using its own functionality
command: "/usr/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner" command: "/usr/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner"

12
scripts/ci/setup/ubuntu/build-environment.yml
View file

@ -35,19 +35,19 @@
# the package lists are updated by "make lcitool-refresh" # the package lists are updated by "make lcitool-refresh"
- name: Include package lists based on OS and architecture - name: Include package lists based on OS and architecture
include_vars: include_vars:
file: "ubuntu-2204-{{ ansible_facts['architecture'] }}.yaml" file: "ubuntu-2404-{{ ansible_facts['architecture'] }}.yaml"
when: when:
- ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '22.04' - ansible_facts['distribution_version'] == '24.04'
- name: Install packages for QEMU on Ubuntu 22.04 - name: Install packages for QEMU on Ubuntu 24.04
package: package:
name: "{{ packages }}" name: "{{ packages }}"
when: when:
- ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '22.04' - ansible_facts['distribution_version'] == '24.04'
- name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 22.04 - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 24.04
package: package:
name: name:
- binutils-arm-linux-gnueabihf - binutils-arm-linux-gnueabihf
@ -62,6 +62,6 @@
- zlib1g-dev:armhf - zlib1g-dev:armhf
when: when:
- ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '22.04' - ansible_facts['distribution_version'] == '24.04'
- ansible_facts['architecture'] == 'aarch64' - ansible_facts['architecture'] == 'aarch64'

4
scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml → scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
View file

@ -1,12 +1,13 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool variables --host-arch aarch64 ubuntu-2204 qemu # $ lcitool variables --host-arch aarch64 ubuntu-2404 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
packages: packages:
- bash - bash
- bc - bc
- bindgen
- bison - bison
- bsdextrautils - bsdextrautils
- bzip2 - bzip2
@ -92,6 +93,7 @@ packages:
- libvdeplug-dev - libvdeplug-dev
- libvirglrenderer-dev - libvirglrenderer-dev
- libvte-2.91-dev - libvte-2.91-dev
- libxdp-dev
- libxen-dev - libxen-dev
- libzstd-dev - libzstd-dev
- llvm - llvm

4
scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml → scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
View file

@ -1,12 +1,13 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool variables --host-arch s390x ubuntu-2204 qemu # $ lcitool variables --host-arch s390x ubuntu-2404 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
packages: packages:
- bash - bash
- bc - bc
- bindgen
- bison - bison
- bsdextrautils - bsdextrautils
- bzip2 - bzip2
@ -91,6 +92,7 @@ packages:
- libvdeplug-dev - libvdeplug-dev
- libvirglrenderer-dev - libvirglrenderer-dev
- libvte-2.91-dev - libvte-2.91-dev
- libxdp-dev
- libzstd-dev - libzstd-dev
- llvm - llvm
- locales - locales

5
scripts/ci/setup/vars.yml.template
View file

@ -6,5 +6,6 @@ ansible_to_gitlab_arch:
x86_64: amd64 x86_64: amd64
aarch64: arm64 aarch64: arm64
s390x: s390x s390x: s390x
# A unique token made available by GitLab to your project for registering runners # A unique token made obtained from GitLab for each runner
gitlab_runner_registration_token: PLEASE_PROVIDE_A_VALID_TOKEN # see: https://gitlab.com/PROJECT/REPO/-/runners/new
gitlab_runner_authentication_token: PLEASE_PROVIDE_A_VALID_TOKEN

2
scripts/meson-buildoptions.sh
View file

@ -58,6 +58,7 @@ meson_options_help() {
printf "%s\n" ' --enable-ubsan enable undefined behaviour sanitizer' printf "%s\n" ' --enable-ubsan enable undefined behaviour sanitizer'
printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-' printf "%s\n" ' --firmwarepath=VALUES search PATH for firmware files [share/qemu-'
printf "%s\n" ' firmware]' printf "%s\n" ' firmware]'
printf "%s\n" ' --gdb=VALUE Path to GDB'
printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler' printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler'
printf "%s\n" ' --includedir=VALUE Header file directory [include]' printf "%s\n" ' --includedir=VALUE Header file directory [include]'
printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for' printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for'
@ -323,6 +324,7 @@ _meson_option_parse() {
--disable-fuzzing) printf "%s" -Dfuzzing=false ;; --disable-fuzzing) printf "%s" -Dfuzzing=false ;;
--enable-gcrypt) printf "%s" -Dgcrypt=enabled ;; --enable-gcrypt) printf "%s" -Dgcrypt=enabled ;;
--disable-gcrypt) printf "%s" -Dgcrypt=disabled ;; --disable-gcrypt) printf "%s" -Dgcrypt=disabled ;;
--gdb=*) quote_sh "-Dgdb=$2" ;;
--enable-gettext) printf "%s" -Dgettext=enabled ;; --enable-gettext) printf "%s" -Dgettext=enabled ;;
--disable-gettext) printf "%s" -Dgettext=disabled ;; --disable-gettext) printf "%s" -Dgettext=disabled ;;
--enable-gio) printf "%s" -Dgio=enabled ;; --enable-gio) printf "%s" -Dgio=enabled ;;

4
tests/Makefile.include
View file

@ -105,11 +105,11 @@ check-venv: $(TESTS_VENV_TOKEN)
FUNCTIONAL_TARGETS=$(patsubst %-softmmu,check-functional-%, $(filter %-softmmu,$(TARGETS))) FUNCTIONAL_TARGETS=$(patsubst %-softmmu,check-functional-%, $(filter %-softmmu,$(TARGETS)))
.PHONY: $(FUNCTIONAL_TARGETS) .PHONY: $(FUNCTIONAL_TARGETS)
$(FUNCTIONAL_TARGETS): $(FUNCTIONAL_TARGETS): check-venv
@$(MAKE) SPEED=thorough $(subst -functional,-func,$@) @$(MAKE) SPEED=thorough $(subst -functional,-func,$@)
.PHONY: check-functional .PHONY: check-functional
check-functional: check-functional: check-venv
@$(NINJA) precache-functional @$(NINJA) precache-functional
@QEMU_TEST_NO_DOWNLOAD=1 $(MAKE) SPEED=thorough check-func check-func-quick @QEMU_TEST_NO_DOWNLOAD=1 $(MAKE) SPEED=thorough check-func check-func-quick

2
tests/docker/dockerfiles/debian-i686-cross.docker
View file

@ -178,7 +178,7 @@ ENV ABI "i686-linux-gnu"
ENV MESON_OPTS "--cross-file=i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu"
ENV RUST_TARGET "i686-unknown-linux-gnu" ENV RUST_TARGET "i686-unknown-linux-gnu"
ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-linux-gnu- ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-linux-gnu-
ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user ENV DEF_TARGET_LIST i386-softmmu,i386-linux-user
# As a final step configure the user (if env is defined) # As a final step configure the user (if env is defined)
ARG USER ARG USER
ARG UID ARG UID

12
tests/functional/aarch64/test_reverse_debug.py
View file

@ -2,36 +2,34 @@
# #
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# #
# Reverse debugging test # Reverse debugging test for aarch64
# #
# Copyright (c) 2020 ISP RAS # Copyright (c) 2020 ISP RAS
# Copyright (c) 2025 Linaro Limited
# #
# Author: # Author:
# Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru> # Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
# Gustavo Romero <gustavo.romero@linaro.org> (Run without Avocado)
# #
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
from qemu_test import Asset, skipIfMissingImports, skipFlakyTest from qemu_test import Asset, skipFlakyTest
from reverse_debugging import ReverseDebugging from reverse_debugging import ReverseDebugging
@skipIfMissingImports('avocado.utils')
class ReverseDebugging_AArch64(ReverseDebugging): class ReverseDebugging_AArch64(ReverseDebugging):
REG_PC = 32
ASSET_KERNEL = Asset( ASSET_KERNEL = Asset(
('https://archives.fedoraproject.org/pub/archive/fedora/linux/' ('https://archives.fedoraproject.org/pub/archive/fedora/linux/'
'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz'), 'releases/29/Everything/aarch64/os/images/pxeboot/vmlinuz'),
'7e1430b81c26bdd0da025eeb8fbd77b5dc961da4364af26e771bd39f379cbbf7') '7e1430b81c26bdd0da025eeb8fbd77b5dc961da4364af26e771bd39f379cbbf7')
@skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/2921")
def test_aarch64_virt(self): def test_aarch64_virt(self):
self.set_machine('virt') self.set_machine('virt')
self.cpu = 'cortex-a53' self.cpu = 'cortex-a53'
kernel_path = self.ASSET_KERNEL.fetch() kernel_path = self.ASSET_KERNEL.fetch()
self.reverse_debugging(args=('-kernel', kernel_path)) self.reverse_debugging(gdb_arch='aarch64', args=('-kernel', kernel_path))
if __name__ == '__main__': if __name__ == '__main__':

6
tests/functional/meson.build
View file

@ -77,6 +77,12 @@ foreach speed : ['quick', 'thorough']
test_env.set('PYTHONPATH', meson.project_source_root() / 'python:' + test_env.set('PYTHONPATH', meson.project_source_root() / 'python:' +
meson.current_source_dir()) meson.current_source_dir())
# Define the GDB environment variable if gdb is available.
gdb = get_option('gdb')
if gdb != ''
test_env.set('QEMU_TEST_GDB', gdb)
endif
foreach test : target_tests foreach test : target_tests
testname = '@0@-@1@'.format(target_base, test) testname = '@0@-@1@'.format(target_base, test)
if fs.exists('generic' / 'test_' + test + '.py') if fs.exists('generic' / 'test_' + test + '.py')

15
tests/functional/ppc64/test_reverse_debug.py
View file

@ -2,39 +2,36 @@
# #
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# #
# Reverse debugging test # Reverse debugging test for ppc64
# #
# Copyright (c) 2020 ISP RAS # Copyright (c) 2020 ISP RAS
# Copyright (c) 2025 Linaro Limited
# #
# Author: # Author:
# Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru> # Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
# Gustavo Romero <gustavo.romero@linaro.org> (Run without Avocado)
# #
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
from qemu_test import skipIfMissingImports, skipFlakyTest from qemu_test import skipFlakyTest
from reverse_debugging import ReverseDebugging from reverse_debugging import ReverseDebugging
@skipIfMissingImports('avocado.utils')
class ReverseDebugging_ppc64(ReverseDebugging): class ReverseDebugging_ppc64(ReverseDebugging):
REG_PC = 0x40
@skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/1992") @skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/1992")
def test_ppc64_pseries(self): def test_ppc64_pseries(self):
self.set_machine('pseries') self.set_machine('pseries')
# SLOF branches back to its entry point, which causes this test # SLOF branches back to its entry point, which causes this test
# to take the 'hit a breakpoint again' path. That's not a problem, # to take the 'hit a breakpoint again' path. That's not a problem,
# just slightly different than the other machines. # just slightly different than the other machines.
self.endian_is_le = False self.reverse_debugging(gdb_arch='powerpc:common64')
self.reverse_debugging()
@skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/1992") @skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/1992")
def test_ppc64_powernv(self): def test_ppc64_powernv(self):
self.set_machine('powernv') self.set_machine('powernv')
self.endian_is_le = False self.reverse_debugging(gdb_arch='powerpc:common64')
self.reverse_debugging()
if __name__ == '__main__': if __name__ == '__main__':

4
tests/functional/qemu_test/__init__.py
View file

@ -15,6 +15,8 @@ from .testcase import QemuBaseTest, QemuUserTest, QemuSystemTest
from .linuxkernel import LinuxKernelTest from .linuxkernel import LinuxKernelTest
from .decorators import skipIfMissingCommands, skipIfNotMachine, \ from .decorators import skipIfMissingCommands, skipIfNotMachine, \
skipFlakyTest, skipUntrustedTest, skipBigDataTest, skipSlowTest, \ skipFlakyTest, skipUntrustedTest, skipBigDataTest, skipSlowTest, \
skipIfMissingImports, skipIfOperatingSystem, skipLockedMemoryTest skipIfMissingImports, skipIfOperatingSystem, skipLockedMemoryTest, \
skipIfMissingEnv
from .archive import archive_extract from .archive import archive_extract
from .uncompress import uncompress from .uncompress import uncompress
from .gdb import GDB

18
tests/functional/qemu_test/decorators.py
View file

@ -11,6 +11,24 @@ from unittest import skipIf, skipUnless
from .cmd import which from .cmd import which
''' '''
Decorator to skip execution of a test if the provided
environment variables are not set.
Example:
@skipIfMissingEnv("QEMU_ENV_VAR0", "QEMU_ENV_VAR1")
'''
def skipIfMissingEnv(*vars_):
missing_vars = []
for var in vars_:
if os.getenv(var) == None:
missing_vars.append(var)
has_vars = True if len(missing_vars) == 0 else False
return skipUnless(has_vars, f"Missing env var(s): {', '.join(missing_vars)}")
'''
Decorator to skip execution of a test if the list Decorator to skip execution of a test if the list
of command binaries is not available in $PATH. of command binaries is not available in $PATH.
Example: Example:

86
tests/functional/qemu_test/gdb.py Normal file
View file

@ -0,0 +1,86 @@
# SPDX-License-Identifier: GPL-2.0-or-later
#
# A simple interface module built around pygdbmi for handling GDB commands.
#
# Copyright (c) 2025 Linaro Limited
#
# Author:
# Gustavo Romero <gustavo.romero@linaro.org>
#
import re
class GDB:
"""Provides methods to run and capture GDB command output."""
def __init__(self, gdb_path, echo=True, suffix='# ', prompt="$ "):
from pygdbmi.gdbcontroller import GdbController
from pygdbmi.constants import GdbTimeoutError
type(self).TimeoutError = GdbTimeoutError
gdb_cmd = [gdb_path, "-q", "--interpreter=mi2"]
self.gdbmi = GdbController(gdb_cmd)
self.echo = echo
self.suffix = suffix
self.prompt = prompt
self.response = None
self.cmd_output = None
def get_payload(self, response, kind):
output = []
for o in response:
# Unpack payloads of the same type.
_type, _, payload, *_ = o.values()
if _type == kind:
output += [payload]
# Some output lines do not end with \n but begin with it,
# so remove the leading \n and merge them with the next line
# that ends with \n.
lines = [line.lstrip('\n') for line in output]
lines = "".join(lines)
lines = lines.splitlines(keepends=True)
return lines
def cli(self, cmd, timeout=32.0):
self.response = self.gdbmi.write(cmd, timeout_sec=timeout)
self.cmd_output = self.get_payload(self.response, kind="console")
if self.echo:
print(self.suffix + self.prompt + cmd)
if len(self.cmd_output) > 0:
cmd_output = self.suffix.join(self.cmd_output)
print(self.suffix + cmd_output, end="")
return self
def get_addr(self):
address_pattern = r"0x[0-9A-Fa-f]+"
cmd_output = "".join(self.cmd_output) # Concat output lines.
match = re.search(address_pattern, cmd_output)
return int(match[0], 16) if match else None
def get_log(self):
r = self.get_payload(self.response, kind="log")
r = "".join(r)
return r
def get_console(self):
r = "".join(self.cmd_output)
return r
def exit(self):
self.gdbmi.exit()

154
tests/functional/reverse_debugging.py
View file

@ -1,18 +1,23 @@
# Reverse debugging test
#
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# #
# Reverse debugging test
#
# Copyright (c) 2020 ISP RAS # Copyright (c) 2020 ISP RAS
# Copyright (c) 2025 Linaro Limited
# #
# Author: # Author:
# Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru> # Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
# Gustavo Romero <gustavo.romero@linaro.org> (Run without Avocado)
# #
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
import os
import logging
from qemu_test import LinuxKernelTest, get_qemu_img import logging
import os
from subprocess import check_output
from qemu_test import LinuxKernelTest, get_qemu_img, GDB, \
skipIfMissingEnv, skipIfMissingImports
from qemu_test.ports import Ports from qemu_test.ports import Ports
@ -28,13 +33,9 @@ class ReverseDebugging(LinuxKernelTest):
that the execution is stopped at the last of them. that the execution is stopped at the last of them.
""" """
timeout = 10
STEPS = 10 STEPS = 10
endian_is_le = True
def run_vm(self, record, shift, args, replay_path, image_path, port): def run_vm(self, record, shift, args, replay_path, image_path, port):
from avocado.utils import datadrainer
logger = logging.getLogger('replay') logger = logging.getLogger('replay')
vm = self.get_vm(name='record' if record else 'replay') vm = self.get_vm(name='record' if record else 'replay')
vm.set_console() vm.set_console()
@ -52,55 +53,20 @@ class ReverseDebugging(LinuxKernelTest):
if args: if args:
vm.add_args(*args) vm.add_args(*args)
vm.launch() vm.launch()
console_drainer = datadrainer.LineLogger(vm.console_socket.fileno(),
logger=self.log.getChild('console'),
stop_check=(lambda : not vm.is_running()))
console_drainer.start()
return vm return vm
@staticmethod @staticmethod
def get_reg_le(g, reg): def get_pc(gdb: GDB):
res = g.cmd(b'p%x' % reg) return gdb.cli("print $pc").get_addr()
num = 0
for i in range(len(res))[-2::-2]:
num = 0x100 * num + int(res[i:i + 2], 16)
return num
@staticmethod
def get_reg_be(g, reg):
res = g.cmd(b'p%x' % reg)
return int(res, 16)
def get_reg(self, g, reg):
# value may be encoded in BE or LE order
if self.endian_is_le:
return self.get_reg_le(g, reg)
else:
return self.get_reg_be(g, reg)
def get_pc(self, g):
return self.get_reg(g, self.REG_PC)
def check_pc(self, g, addr):
pc = self.get_pc(g)
if pc != addr:
self.fail('Invalid PC (read %x instead of %x)' % (pc, addr))
@staticmethod
def gdb_step(g):
g.cmd(b's', b'T05thread:01;')
@staticmethod
def gdb_bstep(g):
g.cmd(b'bs', b'T05thread:01;')
@staticmethod @staticmethod
def vm_get_icount(vm): def vm_get_icount(vm):
return vm.qmp('query-replay')['return']['icount'] return vm.qmp('query-replay')['return']['icount']
def reverse_debugging(self, shift=7, args=None): @skipIfMissingImports("pygdbmi") # Required by GDB class
from avocado.utils import gdb @skipIfMissingEnv("QEMU_TEST_GDB")
from avocado.utils import process def reverse_debugging(self, gdb_arch, shift=7, args=None):
from qemu_test import GDB
logger = logging.getLogger('replay') logger = logging.getLogger('replay')
@ -111,8 +77,9 @@ class ReverseDebugging(LinuxKernelTest):
if qemu_img is None: if qemu_img is None:
self.skipTest('Could not find "qemu-img", which is required to ' self.skipTest('Could not find "qemu-img", which is required to '
'create the temporary qcow2 image') 'create the temporary qcow2 image')
cmd = '%s create -f qcow2 %s 128M' % (qemu_img, image_path) out = check_output([qemu_img, 'create', '-f', 'qcow2', image_path, '128M'],
process.run(cmd) encoding='utf8')
logger.info("qemu-img: %s" % out)
replay_path = os.path.join(self.workdir, 'replay.bin') replay_path = os.path.join(self.workdir, 'replay.bin')
@ -129,68 +96,107 @@ class ReverseDebugging(LinuxKernelTest):
with Ports() as ports: with Ports() as ports:
port = ports.find_free_port() port = ports.find_free_port()
vm = self.run_vm(False, shift, args, replay_path, image_path, port) vm = self.run_vm(False, shift, args, replay_path, image_path, port)
logger.info('connecting to gdbstub')
g = gdb.GDBRemote('127.0.0.1', port, False, False) try:
g.connect() logger.info('Connecting to gdbstub...')
r = g.cmd(b'qSupported') self.reverse_debugging_run(vm, port, gdb_arch, last_icount)
if b'qXfer:features:read+' in r: logger.info('Test passed.')
g.cmd(b'qXfer:features:read:target.xml:0,ffb') except GDB.TimeoutError:
if b'ReverseStep+' not in r: # Convert a GDB timeout exception into a unittest failure exception.
raise self.failureException("Timeout while connecting to or "
"communicating with gdbstub...") from None
except Exception:
# Re-throw exceptions from unittest, like the ones caused by fail(),
# skipTest(), etc.
raise
def reverse_debugging_run(self, vm, port, gdb_arch, last_icount):
logger = logging.getLogger('replay')
gdb_cmd = os.getenv('QEMU_TEST_GDB')
gdb = GDB(gdb_cmd)
r = gdb.cli("set architecture").get_log()
if gdb_arch not in r:
self.skipTest(f"GDB does not support arch '{gdb_arch}'")
gdb.cli("set debug remote 1")
c = gdb.cli(f"target remote localhost:{port}").get_console()
if not f"Remote debugging using localhost:{port}" in c:
self.fail("Could not connect to gdbstub!")
# Remote debug messages are in 'log' payloads.
r = gdb.get_log()
if 'ReverseStep+' not in r:
self.fail('Reverse step is not supported by QEMU') self.fail('Reverse step is not supported by QEMU')
if b'ReverseContinue+' not in r: if 'ReverseContinue+' not in r:
self.fail('Reverse continue is not supported by QEMU') self.fail('Reverse continue is not supported by QEMU')
gdb.cli("set debug remote 0")
logger.info('stepping forward') logger.info('stepping forward')
steps = [] steps = []
# record first instruction addresses # record first instruction addresses
for _ in range(self.STEPS): for _ in range(self.STEPS):
pc = self.get_pc(g) pc = self.get_pc(gdb)
logger.info('saving position %x' % pc) logger.info('saving position %x' % pc)
steps.append(pc) steps.append(pc)
self.gdb_step(g) gdb.cli("stepi")
# visit the recorded instruction in reverse order # visit the recorded instruction in reverse order
logger.info('stepping backward') logger.info('stepping backward')
for addr in steps[::-1]: for addr in steps[::-1]:
self.gdb_bstep(g)
self.check_pc(g, addr)
logger.info('found position %x' % addr) logger.info('found position %x' % addr)
gdb.cli("reverse-stepi")
pc = self.get_pc(gdb)
if pc != addr:
logger.info('Invalid PC (read %x instead of %x)' % (pc, addr))
self.fail('Reverse stepping failed!')
# visit the recorded instruction in forward order # visit the recorded instruction in forward order
logger.info('stepping forward') logger.info('stepping forward')
for addr in steps: for addr in steps:
self.check_pc(g, addr)
self.gdb_step(g)
logger.info('found position %x' % addr) logger.info('found position %x' % addr)
pc = self.get_pc(gdb)
if pc != addr:
logger.info('Invalid PC (read %x instead of %x)' % (pc, addr))
self.fail('Forward stepping failed!')
gdb.cli("stepi")
# set breakpoints for the instructions just stepped over # set breakpoints for the instructions just stepped over
logger.info('setting breakpoints') logger.info('setting breakpoints')
for addr in steps: for addr in steps:
# hardware breakpoint at addr with len=1 gdb.cli(f"break *{hex(addr)}")
g.cmd(b'Z1,%x,1' % addr, b'OK')
# this may hit a breakpoint if first instructions are executed # this may hit a breakpoint if first instructions are executed
# again # again
logger.info('continuing execution') logger.info('continuing execution')
vm.qmp('replay-break', icount=last_icount - 1) vm.qmp('replay-break', icount=last_icount - 1)
# continue - will return after pausing # continue - will return after pausing
# This could stop at the end and get a T02 return, or by # This can stop at the end of the replay-break and gdb gets a SIGINT,
# re-executing one of the breakpoints and get a T05 return. # or by re-executing one of the breakpoints and gdb stops at a
g.cmd(b'c') # breakpoint.
gdb.cli("continue")
if self.vm_get_icount(vm) == last_icount - 1: if self.vm_get_icount(vm) == last_icount - 1:
logger.info('reached the end (icount %s)' % (last_icount - 1)) logger.info('reached the end (icount %s)' % (last_icount - 1))
else: else:
logger.info('hit a breakpoint again at %x (icount %s)' % logger.info('hit a breakpoint again at %x (icount %s)' %
(self.get_pc(g), self.vm_get_icount(vm))) (self.get_pc(gdb), self.vm_get_icount(vm)))
logger.info('running reverse continue to reach %x' % steps[-1]) logger.info('running reverse continue to reach %x' % steps[-1])
# reverse continue - will return after stopping at the breakpoint # reverse continue - will return after stopping at the breakpoint
g.cmd(b'bc', b'T05thread:01;') gdb.cli("reverse-continue")
# assume that none of the first instructions is executed again # assume that none of the first instructions is executed again
# breaking the order of the breakpoints # breaking the order of the breakpoints
self.check_pc(g, steps[-1]) pc = self.get_pc(gdb)
if pc != steps[-1]:
self.fail("'reverse-continue' did not hit the first PC in reverse order!")
logger.info('successfully reached %x' % steps[-1]) logger.info('successfully reached %x' % steps[-1])
logger.info('exiting gdb and qemu') logger.info('exiting gdb and qemu')
gdb.exit()
vm.shutdown() vm.shutdown()

15
tests/functional/x86_64/test_reverse_debug.py
View file

@ -2,34 +2,29 @@
# #
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# #
# Reverse debugging test # Reverse debugging test for x86_64
# #
# Copyright (c) 2020 ISP RAS # Copyright (c) 2020 ISP RAS
# Copyright (c) 2025 Linaro Limited
# #
# Author: # Author:
# Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru> # Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
# Gustavo Romero <gustavo.romero@linaro.org> (Run without Avocado)
# #
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
from qemu_test import skipIfMissingImports, skipFlakyTest from qemu_test import skipFlakyTest
from reverse_debugging import ReverseDebugging from reverse_debugging import ReverseDebugging
@skipIfMissingImports('avocado.utils')
class ReverseDebugging_X86_64(ReverseDebugging): class ReverseDebugging_X86_64(ReverseDebugging):
REG_PC = 0x10
REG_CS = 0x12
def get_pc(self, g):
return self.get_reg_le(g, self.REG_PC) \
+ self.get_reg_le(g, self.REG_CS) * 0x10
@skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/2922") @skipFlakyTest("https://gitlab.com/qemu-project/qemu/-/issues/2922")
def test_x86_64_pc(self): def test_x86_64_pc(self):
self.set_machine('pc') self.set_machine('pc')
# start with BIOS only # start with BIOS only
self.reverse_debugging() self.reverse_debugging(gdb_arch='x86-64')
if __name__ == '__main__': if __name__ == '__main__':

6
tests/lcitool/refresh
View file

@ -216,8 +216,6 @@ try:
generate_dockerfile("debian-i686-cross", "debian-13", generate_dockerfile("debian-i686-cross", "debian-13",
cross="i686", cross="i686",
trailer=cross_build("i686-linux-gnu-", trailer=cross_build("i686-linux-gnu-",
"x86_64-softmmu,"
"x86_64-linux-user,"
"i386-softmmu,i386-linux-user")) "i386-softmmu,i386-linux-user"))
# mips no longer supported in debian-13 # mips no longer supported in debian-13
@ -272,8 +270,8 @@ try:
# #
# Ansible package lists # Ansible package lists
# #
generate_yaml("ubuntu", "ubuntu-2204", "aarch64") generate_yaml("ubuntu", "ubuntu-2404", "aarch64")
generate_yaml("ubuntu", "ubuntu-2204", "s390x") generate_yaml("ubuntu", "ubuntu-2404", "s390x")
sys.exit(0) sys.exit(0)