CONFIG_UCODE_SCAN_DEFAULT only exists in Xen 4.21.  In older versions of xen,
use ucode=scan on the command line.

Fixes: 690655a511cd ("CI: Include microcode for x86 hardware jobs")
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Jan Beulich <JBeulich@suse.com>

The fixes tag is the 4.20 backport, not the original patch.  Found while
trying to test the microcode loading backports.  (At least the XenServer
testing has proved more useful).

4.20 is the oldest branch that tries to load microcode in Gitlab CI, so this
does not need backporting further.

https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/2126131501
---
 automation/gitlab-ci/build.yaml                | 1 -
 automation/scripts/qubes-x86-64.sh             | 4 ++--
 automation/scripts/xilinx-smoke-dom0-x86_64.sh | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 5d382bcd246e..5f0acda942ac 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -306,7 +306,6 @@ alpine-3.18-gcc-debug:
       CONFIG_ARGO=y
       CONFIG_UBSAN=y
       CONFIG_UBSAN_FATAL=y
-      CONFIG_UCODE_SCAN_DEFAULT=y
       CONFIG_XHCI=y
 
 debian-12-x86_64-gcc-debug:
diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh
index e20a38e4f396..7a8b12cca483 100755
--- a/automation/scripts/qubes-x86-64.sh
+++ b/automation/scripts/qubes-x86-64.sh
@@ -247,14 +247,14 @@ TFTP=/scratch/gitlab-runner/tftp
 CONTROLLER=control@thor.testnet
 
 echo "
-multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts
+multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot ucode=scan $extra_xen_opts
 module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen
 module2 --nounzip (http)/gitlab-ci/initrd-dom0
 " > $TFTP/grub.cfg
 
 echo "#!ipxe
 
-kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts || reboot
+kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot ucode=scan $extra_xen_opts || reboot
 module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot
 module /gitlab-ci/initrd-dom0 || reboot
 boot
diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh
index e68b0ce61faf..468143376df5 100755
--- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh
+++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh
@@ -15,7 +15,7 @@ WORKDIR="${PWD}"
 TEST="$1"
 PASS_MSG="Test passed: ${TEST}"
 XEN_CMD_DOM0="dom0=pvh dom0_max_vcpus=4 dom0_mem=4G"
-XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot"
+XEN_CMD_XEN="sched=null loglvl=all guest_loglvl=all console_timestamps=boot ucode=scan"
 XEN_CMD_EXTRA=""
 DOM0_CMD=""
 DOMU_CMD=""

base-commit: 3324a6dbb25bb2975c35f4f2b20c6725f2a7724b
prerequisite-patch-id: 9d3f448db19cd78efd8ff7a82f1e3e19d3fc53e3
prerequisite-patch-id: 041eb4352fbc857fbad3a29bf9b0ed04f31c31be
prerequisite-patch-id: 35e1edd03c25f555fdf0f6eb1d71e80fa9ef77eb
prerequisite-patch-id: 20c59be6b65c2aa61e2a364db27edcce2477f6f5
prerequisite-patch-id: 70359f42f93eeb549f0fcbcbf39a5df99ebeffc0
-- 
2.39.5

On 28.10.2025 20:45, Andrew Cooper wrote:
> CONFIG_UCODE_SCAN_DEFAULT only exists in Xen 4.21.  In older versions of xen,
> use ucode=scan on the command line.
> 
> Fixes: 690655a511cd ("CI: Include microcode for x86 hardware jobs")
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

FWIW (changes look plausible and complete / consistent to me, but the CI stuff
continues to be an area I'm not really fluent with):
Acked-by: Jan Beulich <jbeulich@suse.com>

Jan