Commit 0d76c3a829 for qemu.org

commit 0d76c3a82947e8ca1a5caff6d91f5dacdd101a01
Author: Alex Bennée <alex.bennee@linaro.org>
Date:   Thu Sep 17 17:55:50 2026 +0100

    tests/tcg: prefix meson built docker tags with qemu/

    With the meson changes we now build the images directly by calling
    docker.py. However the Makefile.include builds prefix all the images
    with qemu/:

      # General rule for building docker images.
      docker-image-%: $(DOCKER_FILES_DIR)/%.docker
                $(call quiet-command,                       \
                      DOCKER_BUILDKIT=1 $(CONTAINER_COMMAND) build \
                      $(if $(DOCKER_V),,--quiet)            \
                      $(if $(NOCACHE),--no-cache,           \
                              $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REGISTRY)/qemu/$*)) \
                      --build-arg BUILDKIT_INLINE_CACHE=1   \
                      $(if $(NOUSER),,                      \
                              --build-arg USER=$(USER)      \
                              --build-arg UID=$(UID))               \
                      -t qemu/$* - < $< $(if $(DOCKER_V),,> /dev/null),\
                      "BUILD", $*)

    So to ensure we don't end up building every container twice make sure
    the naming conventions line up.

    Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
    Tested-by: Richard Henderson <richard.henderson@linaro.org>
    Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
    Message-ID: <20260917165602.3405537-7-alex.bennee@linaro.org>
    Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index d41a228fb3..0604c4b90b 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -255,7 +255,7 @@ foreach target, plan: tcg_tests
     image_name = 'image-' + cc_dockerfile
     has_docker = docker_host_arch_supported and docker_supported
     if cc_dockerfile not in image_targets and has_docker
-      cmd = [docker_wrapper, 'build', '-f', dockerfile, '-t', cc_dockerfile]
+      cmd = [docker_wrapper, 'build', '-f', dockerfile, '-t', 'qemu/' + cc_dockerfile]
       t = custom_target(image_name, command: cmd,
                         build_by_default: false,
                         output: 'no_output_' + image_name)
@@ -270,7 +270,7 @@ foreach target, plan: tcg_tests
       here = meson.project_build_root()
       cc = [docker_wrapper, 'run', '--run-as-current-user',
             '-w', here, '-v', mount,
-            cc_dockerfile, plan['cc']]
+            'qemu/' + cc_dockerfile, plan['cc']]
       has_cc = true
     endif
   endif
@@ -279,7 +279,7 @@ foreach target, plan: tcg_tests
   if has_cc
     summary_cc = plan['cc']
     if not cc_from_system
-      summary_cc += ' (from \'' + plan['cc_dockerfile'] + '\' container)'
+      summary_cc += ' (from \'qemu/' + plan['cc_dockerfile'] + '\' container)'
     endif
   endif
   tcg_tests_summary += {'cc for ' + target: summary_cc}