From efee710407b8c6eee5b2820f2e37136b8b21724c Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 28 Oct 2025 19:39:21 +0000 Subject: [PATCH] CI: Fix microcode loading on Xen 4.20 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 Acked-by: Jan Beulich Acked-by: Stefano Stabellini --- 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 5d382bcd24..5f0acda942 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 e20a38e4f3..7a8b12cca4 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 e68b0ce61f..468143376d 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=""