Commit fec4cd08bb for qemu.org

commit fec4cd08bb7bee3ac5b8153ab10550ce20d6222c
Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date:   Wed Sep 23 11:57:21 2026 -0700

    tests/lcitool/refresh: generate dockerfiles using --host-arch x86_64

    To ensure refresh output is consistent on any host architecture, we need
    to specify which host arch it's supposed to target.
    Indeed, by default, package list will depend on host architecture, which
    means that output will depend on which machine runs refresh command.
    For example, on aarch64 host, refresh removes libpmem-dev package since
    it's not available.

    Also, update lcitool submodule: It now uses arch specific images by
    default. Thus we update all images at the same time.
    https://gitlab.com/libvirt/libvirt-ci/-/commit/f34cd57eb892259c26600187bc35cc4152f932cf

    Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
    Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
    Link: https://lore.kernel.org/qemu-devel/20260923185725.863311-3-pierrick.bouvier@oss.qualcomm.com
    Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>

diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 7c342e801c..f1a5923e70 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all alpine-323 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 alpine-323 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker
index 8bfce395f9..4201352533 100644
--- a/tests/docker/dockerfiles/centos9.docker
+++ b/tests/docker/dockerfiles/centos9.docker
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all centos-stream-9 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 centos-stream-9 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker
index c0ab05a5ff..45edba38e9 100644
--- a/tests/docker/dockerfiles/debian-all-test-cross.docker
+++ b/tests/docker/dockerfiles/debian-all-test-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all debian-13 qemu-minimal
+#  $ lcitool dockerfile --layers all --host-arch x86_64 debian-13 qemu-minimal
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 975b9f346e..227cc77375 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch x86_64 debian-13 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 --cross-arch x86_64 debian-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 3efce40482..f0c23718fa 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch aarch64 debian-13 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 --cross-arch aarch64 debian-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 91e8587b5d..ff240096d8 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch armv7l debian-13 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 --cross-arch armv7l debian-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index a60b72e05b..276df72651 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch i686 debian-13 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 --cross-arch i686 debian-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index a7599b4f61..54b9564abb 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch ppc64le debian-13 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 --cross-arch ppc64le debian-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index 52661d4d9e..d807825b83 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch riscv64 debian-13 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 --cross-arch riscv64 debian-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index 0a04777b36..1a6b688425 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch s390x debian-13 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 --cross-arch s390x debian-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker
index 77869f7154..ce591feec2 100644
--- a/tests/docker/dockerfiles/debian.docker
+++ b/tests/docker/dockerfiles/debian.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all debian-13 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 debian-13 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

-FROM docker.io/library/debian:13-slim
+FROM docker.io/amd64/debian:13-slim

 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/docker/dockerfiles/fedora-rust-nightly.docker
index 0f7b4c1338..144325ae1e 100644
--- a/tests/docker/dockerfiles/fedora-rust-nightly.docker
+++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all fedora-43 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 fedora-43 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 3ed3e15df3..9b366c7c73 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-43 qemu,qemu-win-installer
+#  $ lcitool dockerfile --layers all --host-arch x86_64 --cross-arch mingw64 fedora-43 qemu,qemu-win-installer
 #
 # https://gitlab.com/libvirt/libvirt-ci

diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 8fa8bea1ab..8f7e9efc89 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all fedora-43 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 fedora-43 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 3a3d6f73c8..1b306d4b64 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all opensuse-leap-16 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 opensuse-leap-16 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

diff --git a/tests/docker/dockerfiles/ubuntu2404.docker b/tests/docker/dockerfiles/ubuntu2404.docker
index bb8f4e4e53..cafbc38240 100644
--- a/tests/docker/dockerfiles/ubuntu2404.docker
+++ b/tests/docker/dockerfiles/ubuntu2404.docker
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all ubuntu-2404 qemu
+#  $ lcitool dockerfile --layers all --host-arch x86_64 ubuntu-2404 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci

diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index 76b5dd5b5c..f34cd57eb8 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 76b5dd5b5c84511e2e799c2b3d6a2a9b9f6a081d
+Subproject commit f34cd57eb892259c26600187bc35cc4152f932cf
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 9a71af0e41..002ab11270 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -66,7 +66,7 @@ add_user_mapping = [
 def generate_dockerfile(host, target, project="qemu", cross=None, trailer=None,
                         enable_rust=True):
     filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker")
-    cmd = lcitool_cmd + ["dockerfile"]
+    cmd = lcitool_cmd + ["dockerfile", "--host-arch", "x86_64"]
     if cross is not None:
         cmd.extend(["--cross", cross])
     cmd.extend([target, project])