Commit 6bedcae8a4 for qemu.org
commit 6bedcae8a456639115834d05c4c9d97e9c5d7350
Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date: Wed Sep 23 11:57:23 2026 -0700
tests/tcg/meson.build: remove cc_docker_host_arch
Now we know all container images used for tcg-tests are x86_64 only, we
don't need to specify anymore which arch they support.
Link: https://lore.kernel.org/qemu-devel/20260923185725.863311-5-pierrick.bouvier@oss.qualcomm.com
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
diff --git a/tests/tcg/aarch64/meson.build b/tests/tcg/aarch64/meson.build
index 28498e82cb..cc2c59fb4b 100644
--- a/tests/tcg/aarch64/meson.build
+++ b/tests/tcg/aarch64/meson.build
@@ -1,6 +1,5 @@
cc = 'aarch64-linux-gnu-gcc'
cc_dockerfile = 'debian-all-test-cross'
-cc_docker_host_arch = ['aarch64', 'x86_64']
cc_feat_cflags = {
'aes': '-march=armv8-a+aes',
@@ -198,7 +197,6 @@ if 'qemu-aarch64' in emulators
'aarch64-linux-user': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'cc_feat_cflags': cc_feat_cflags,
'folder': 'aarch64',
'gdb_arch': 'aarch64',
diff --git a/tests/tcg/aarch64/system/meson.build b/tests/tcg/aarch64/system/meson.build
index 94e16ba330..6ba35a9f72 100644
--- a/tests/tcg/aarch64/system/meson.build
+++ b/tests/tcg/aarch64/system/meson.build
@@ -97,7 +97,6 @@ if 'qemu-system-aarch64' in emulators
'aarch64-softmmu': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'cc_feat_cflags': cc_feat_cflags,
'folder': 'aarch64/system',
'gdb_arch': 'aarch64',
diff --git a/tests/tcg/aarch64_be/meson.build b/tests/tcg/aarch64_be/meson.build
index 9ea111f988..e45a49ec2d 100644
--- a/tests/tcg/aarch64_be/meson.build
+++ b/tests/tcg/aarch64_be/meson.build
@@ -11,7 +11,6 @@ if 'qemu-aarch64_be' in emulators
'aarch64_be-linux-user': {
'cc': 'aarch64-linux-gnu-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['aarch64', 'x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'aarch64_be',
'gdb_arch': 'aarch64_be',
diff --git a/tests/tcg/alpha/meson.build b/tests/tcg/alpha/meson.build
index fe60ce2496..30ea2a6978 100644
--- a/tests/tcg/alpha/meson.build
+++ b/tests/tcg/alpha/meson.build
@@ -1,6 +1,5 @@
cc = 'alpha-linux-gnu-gcc'
cc_dockerfile = 'debian-all-test-cross'
-cc_docker_host_arch = ['aarch64', 'x86_64']
subdir('system')
@@ -45,7 +44,6 @@ if 'qemu-alpha' in emulators
'alpha-linux-user': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'alpha',
'gdb_arch': 'alpha',
'qemu': emulators['qemu-alpha'],
diff --git a/tests/tcg/alpha/system/meson.build b/tests/tcg/alpha/system/meson.build
index b10f2c3e28..5388e17a2f 100644
--- a/tests/tcg/alpha/system/meson.build
+++ b/tests/tcg/alpha/system/meson.build
@@ -37,7 +37,6 @@ if 'qemu-system-alpha' in emulators
'alpha-softmmu': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'alpha/system',
'gdb_arch': 'alpha',
'qemu': emulators['qemu-system-alpha'],
diff --git a/tests/tcg/arm/meson.build b/tests/tcg/arm/meson.build
index 5c2af2189c..8f70411dfd 100644
--- a/tests/tcg/arm/meson.build
+++ b/tests/tcg/arm/meson.build
@@ -1,6 +1,5 @@
cc = 'arm-linux-gnueabihf-gcc'
cc_dockerfile = 'debian-all-test-cross'
-cc_docker_host_arch = ['aarch64', 'x86_64']
subdir('system')
@@ -71,7 +70,6 @@ if 'qemu-arm' in emulators
'arm-linux-user': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'arm',
'gdb_arch': 'arm',
'qemu': emulators['qemu-arm'],
diff --git a/tests/tcg/arm/system/meson.build b/tests/tcg/arm/system/meson.build
index 5286997670..93d0cfec24 100644
--- a/tests/tcg/arm/system/meson.build
+++ b/tests/tcg/arm/system/meson.build
@@ -65,7 +65,6 @@ if 'qemu-system-arm' in emulators
'arm-softmmu': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'arm/system',
'gdb_arch': 'arm',
'qemu': emulators['qemu-system-arm'],
diff --git a/tests/tcg/hexagon/meson.build b/tests/tcg/hexagon/meson.build
index 1cffc63e09..7b220174ff 100644
--- a/tests/tcg/hexagon/meson.build
+++ b/tests/tcg/hexagon/meson.build
@@ -115,7 +115,6 @@ if 'qemu-hexagon' in emulators
'hexagon-linux-user': {
'cc': 'hexagon-unknown-linux-musl-clang',
'cc_dockerfile': 'debian-hexagon-cross',
- 'cc_docker_host_arch': ['x86_64'],
'folder': 'hexagon',
'gdb_arch': 'hexagon_is_not_supported_by_gdb',
'qemu': emulators['qemu-hexagon'],
diff --git a/tests/tcg/hppa/meson.build b/tests/tcg/hppa/meson.build
index 9ca8f29fa9..01d4554d99 100644
--- a/tests/tcg/hppa/meson.build
+++ b/tests/tcg/hppa/meson.build
@@ -11,7 +11,6 @@ if 'qemu-hppa' in emulators
'hppa-linux-user': {
'cc': 'hppa-linux-gnu-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'hppa',
'gdb_arch': 'hppa',
diff --git a/tests/tcg/i386/meson.build b/tests/tcg/i386/meson.build
index 5cda03655f..04d438a062 100644
--- a/tests/tcg/i386/meson.build
+++ b/tests/tcg/i386/meson.build
@@ -1,6 +1,5 @@
cc = 'i686-linux-gnu-gcc'
cc_dockerfile = 'debian-i686-cross'
-cc_docker_host_arch = ['x86_64']
subdir('system')
@@ -48,7 +47,6 @@ if 'qemu-i386' in emulators
'i386-linux-user': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'i386',
'gdb_arch': 'i386',
'qemu': emulators['qemu-i386'],
diff --git a/tests/tcg/i386/system/meson.build b/tests/tcg/i386/system/meson.build
index c08563d0ab..c3a19f4326 100644
--- a/tests/tcg/i386/system/meson.build
+++ b/tests/tcg/i386/system/meson.build
@@ -43,7 +43,6 @@ if 'qemu-system-i386' in emulators
'i386-softmmu': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'i386/system',
'gdb_arch': 'i386',
'qemu': emulators['qemu-system-i386'],
diff --git a/tests/tcg/loongarch64/meson.build b/tests/tcg/loongarch64/meson.build
index 1d62de64ed..4dd64f16d8 100644
--- a/tests/tcg/loongarch64/meson.build
+++ b/tests/tcg/loongarch64/meson.build
@@ -1,6 +1,5 @@
cc = 'loongarch64-unknown-linux-gnu-gcc'
cc_dockerfile = 'debian-loongarch-cross'
-cc_docker_host_arch = ['x86_64']
subdir('system')
@@ -22,7 +21,6 @@ if 'qemu-loongarch64' in emulators
'loongarch64-linux-user': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'loongarch64',
'gdb_arch': 'loongarch64',
'qemu': emulators['qemu-loongarch64'],
diff --git a/tests/tcg/loongarch64/system/meson.build b/tests/tcg/loongarch64/system/meson.build
index 5bf4c56e38..035dd5f85f 100644
--- a/tests/tcg/loongarch64/system/meson.build
+++ b/tests/tcg/loongarch64/system/meson.build
@@ -38,7 +38,6 @@ if 'qemu-system-loongarch64' in emulators
'loongarch64-softmmu': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'loongarch64/system',
'gdb_arch': 'loongarch64',
'qemu': emulators['qemu-system-loongarch64'],
diff --git a/tests/tcg/m68k/meson.build b/tests/tcg/m68k/meson.build
index 8ecf450ac6..4b73d7fc57 100644
--- a/tests/tcg/m68k/meson.build
+++ b/tests/tcg/m68k/meson.build
@@ -12,7 +12,6 @@ if 'qemu-m68k' in emulators
'm68k-linux-user': {
'cc': 'm68k-linux-gnu-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'm68k',
'gdb_arch': 'm68k',
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index 3a6339c2a1..52d073a0bf 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -22,7 +22,6 @@ tcg_tests = {}
# 'name_of_target': {
# 'cc': 'cross_compiler',
# 'cc_dockerfile': 'name_of_dockerfile',
-# 'cc_docker_host_arch': ['host_arch_supported (meson cpu)', ...],
# 'cc_feat_cflags': {
# 'name': ['feature cflags'],
# ...
@@ -211,7 +210,7 @@ foreach target, plan: tcg_tests
# return a clear error if user misspell a target entry
foreach key, _ : plan
- allowed = ['cc', 'cc_dockerfile', 'cc_docker_host_arch', 'cc_feat_cflags',
+ allowed = ['cc', 'cc_dockerfile', 'cc_feat_cflags',
'folder', 'gdb_arch', 'gdb_feat_version', 'qemu', 'tests']
if key not in allowed
error('unknown tcg test plan entry \'' + key + '\' for target ' + target +
@@ -258,14 +257,6 @@ foreach target, plan: tcg_tests
if 'cc_dockerfile' in plan
cc_dockerfile = plan['cc_dockerfile']
- cc_docker_host_arch = plan['cc_docker_host_arch']
- allowed = ['aarch64', 'x86_64']
- foreach arch: cc_docker_host_arch
- if arch not in allowed
- error('incorrect docker arch ' + arch + ' for target ' +
- target + ' (possible: [' + ', '.join(allowed) + '])')
- endif
- endforeach
dockerfile = files('..'/'docker'/'dockerfiles'/cc_dockerfile + '.docker')
image_name = 'image-' + cc_dockerfile
if cc_dockerfile not in image_targets and docker_supported
diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build
index 3c4f6ec482..efda857ab6 100644
--- a/tests/tcg/mips/meson.build
+++ b/tests/tcg/mips/meson.build
@@ -14,7 +14,6 @@ if 'qemu-mips' in emulators
'mips-linux-user': {
'cc': 'mips-linux-gnu-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['aarch64', 'x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'mips',
'gdb_arch': 'mips',
diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build
index 69391c2318..b8eb6705ea 100644
--- a/tests/tcg/mips64/meson.build
+++ b/tests/tcg/mips64/meson.build
@@ -16,7 +16,6 @@ if 'qemu-mips64' in emulators
'mips64-linux-user': {
'cc': 'mips64-linux-gnuabi64-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['aarch64', 'x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'mips64',
'gdb_arch': 'mips64',
diff --git a/tests/tcg/mips64el/meson.build b/tests/tcg/mips64el/meson.build
index f6c0fae798..2aafbba750 100644
--- a/tests/tcg/mips64el/meson.build
+++ b/tests/tcg/mips64el/meson.build
@@ -3,7 +3,6 @@ if 'qemu-mips64el' in emulators
'mips64el-linux-user': {
'cc': 'mips64el-linux-gnuabi64-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['aarch64', 'x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'mips64el',
'gdb_arch': 'mips64el',
diff --git a/tests/tcg/or1k/meson.build b/tests/tcg/or1k/meson.build
index 5151e8f361..c89bb372b4 100644
--- a/tests/tcg/or1k/meson.build
+++ b/tests/tcg/or1k/meson.build
@@ -61,7 +61,6 @@ if 'qemu-or1k' in emulators
'or1k-linux-user': {
'cc': 'or1k-none-linux-musl-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'or1k',
'gdb_arch': 'or1k',
diff --git a/tests/tcg/ppc64/meson.build b/tests/tcg/ppc64/meson.build
index c7e495f3d3..8cca4d65a4 100644
--- a/tests/tcg/ppc64/meson.build
+++ b/tests/tcg/ppc64/meson.build
@@ -44,7 +44,6 @@ if 'qemu-ppc64' in emulators
'ppc64-linux-user': {
'cc': 'powerpc64-linux-gnu-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'ppc64',
'gdb_arch': 'ppc64',
diff --git a/tests/tcg/ppc64le/meson.build b/tests/tcg/ppc64le/meson.build
index 720aa167f2..a0f3e62e4d 100644
--- a/tests/tcg/ppc64le/meson.build
+++ b/tests/tcg/ppc64le/meson.build
@@ -3,7 +3,6 @@ if 'qemu-ppc64le' in emulators
'ppc64le-linux-user': {
'cc': 'powerpc64le-linux-gnu-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'ppc64le',
'gdb_arch': 'ppc64le',
diff --git a/tests/tcg/riscv64/meson.build b/tests/tcg/riscv64/meson.build
index 2292bf8ed1..5ee20a1e98 100644
--- a/tests/tcg/riscv64/meson.build
+++ b/tests/tcg/riscv64/meson.build
@@ -1,6 +1,5 @@
cc = 'riscv64-linux-gnu-gcc'
cc_dockerfile = 'debian-all-test-cross'
-cc_docker_host_arch = ['aarch64', 'x86_64']
subdir('system')
@@ -28,7 +27,6 @@ if 'qemu-riscv64' in emulators
'riscv64-linux-user': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'riscv64',
'gdb_arch': 'riscv64',
'qemu': emulators['qemu-riscv64'],
diff --git a/tests/tcg/riscv64/system/meson.build b/tests/tcg/riscv64/system/meson.build
index 8604c2a45a..87c3f9f11c 100644
--- a/tests/tcg/riscv64/system/meson.build
+++ b/tests/tcg/riscv64/system/meson.build
@@ -66,7 +66,6 @@ if 'qemu-system-riscv64' in emulators
'riscv64-softmmu': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'riscv64',
'gdb_arch': 'riscv64',
'qemu': emulators['qemu-system-riscv64'],
diff --git a/tests/tcg/s390x/meson.build b/tests/tcg/s390x/meson.build
index 39a480033d..1f9aa57fc7 100644
--- a/tests/tcg/s390x/meson.build
+++ b/tests/tcg/s390x/meson.build
@@ -1,6 +1,5 @@
cc = 's390x-linux-gnu-gcc'
cc_dockerfile = 'debian-all-test-cross'
-cc_docker_host_arch = ['aarch64', 'x86_64']
cc_feat_cflags = {
'z14': '-march=z14',
@@ -142,7 +141,6 @@ if 'qemu-s390x' in emulators
's390x-linux-user': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'cc_feat_cflags': cc_feat_cflags,
'folder': 's390x',
'gdb_arch': 's390x',
diff --git a/tests/tcg/s390x/system/meson.build b/tests/tcg/s390x/system/meson.build
index 1e360e7082..ef19c4831f 100644
--- a/tests/tcg/s390x/system/meson.build
+++ b/tests/tcg/s390x/system/meson.build
@@ -83,7 +83,6 @@ if 'qemu-system-s390x' in emulators
's390x-softmmu': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'cc_feat_cflags': cc_feat_cflags,
'folder': 's390x',
'gdb_arch': 's390x',
diff --git a/tests/tcg/sh4/meson.build b/tests/tcg/sh4/meson.build
index d73df07449..12b24fffc7 100644
--- a/tests/tcg/sh4/meson.build
+++ b/tests/tcg/sh4/meson.build
@@ -14,7 +14,6 @@ if 'qemu-sh4' in emulators
'sh4-linux-user': {
'cc': 'sh4-linux-gnu-gcc',
'cc_dockerfile': 'debian-all-test-cross',
- 'cc_docker_host_arch': ['aarch64', 'x86_64'],
'cc_feat_cflags': cc_feat_cflags,
'folder': 'sh4',
'gdb_arch': 'sh4',
diff --git a/tests/tcg/tricore/meson.build b/tests/tcg/tricore/meson.build
index d0bf55dedc..837a3d5e22 100644
--- a/tests/tcg/tricore/meson.build
+++ b/tests/tcg/tricore/meson.build
@@ -47,7 +47,6 @@ if 'qemu-system-tricore' in emulators
'tricore-softmmu': {
'cc': 'tricore-gcc',
'cc_dockerfile': 'debian-tricore-cross',
- 'cc_docker_host_arch': ['x86_64'],
'folder': 'tricore',
'gdb_arch': 'tricore',
'qemu': emulators['qemu-system-tricore'],
diff --git a/tests/tcg/x86_64/meson.build b/tests/tcg/x86_64/meson.build
index ab336eca9b..787a2ca61b 100644
--- a/tests/tcg/x86_64/meson.build
+++ b/tests/tcg/x86_64/meson.build
@@ -1,6 +1,5 @@
cc = 'x86_64-linux-gnu-gcc'
cc_dockerfile = 'debian-amd64-cross'
-cc_docker_host_arch = ['x86_64']
subdir('system')
@@ -74,7 +73,6 @@ if 'qemu-x86_64' in emulators
'x86_64-linux-user': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'x86_64',
'gdb_arch': 'x86_64',
'qemu': emulators['qemu-x86_64'],
diff --git a/tests/tcg/x86_64/system/meson.build b/tests/tcg/x86_64/system/meson.build
index 80110d0ae5..43e7d7afa8 100644
--- a/tests/tcg/x86_64/system/meson.build
+++ b/tests/tcg/x86_64/system/meson.build
@@ -53,7 +53,6 @@ if 'qemu-system-x86_64' in emulators
'x86_64-softmmu': {
'cc': cc,
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'x86_64/system',
'gdb_arch': 'x86_64',
'qemu': emulators['qemu-system-x86_64'],
diff --git a/tests/tcg/xtensa/meson.build b/tests/tcg/xtensa/meson.build
index bb1dd1542e..5ff9c6cd54 100644
--- a/tests/tcg/xtensa/meson.build
+++ b/tests/tcg/xtensa/meson.build
@@ -79,14 +79,12 @@ foreach core: cores
endforeach
cc_dockerfile = 'debian-xtensa-cross'
-cc_docker_host_arch = ['x86_64']
if 'qemu-system-xtensa' in emulators
tcg_tests += {
'xtensa-softmmu': {
'cc': 'xtensa-dc232b-elf-gcc',
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'xtensa',
'gdb_arch': 'xtensa',
'qemu': emulators['qemu-system-xtensa'],
@@ -100,7 +98,6 @@ if 'qemu-system-xtensaeb' in emulators
'xtensaeb-softmmu': {
'cc': 'xtensa-test_kc705_be-elf-gcc',
'cc_dockerfile': cc_dockerfile,
- 'cc_docker_host_arch': cc_docker_host_arch,
'folder': 'xtensa',
'gdb_arch': 'xtensaeb',
'qemu': emulators['qemu-system-xtensaeb'],