On 22.07.2025 02:05, Alejandro Vallejo wrote:
> Hi,
>
> Really minor changes wrt v7
>
> 1. s/BOOTMOD_XSM/BOOTMOD_XSM_POLICY/
> 2. Remove stale obj-y statements in the last patch
>
> pipeline:
> https://gitlab.com/xen-project/people/agvallejo/xen/-/pipelines/1940366600
>
> v7:
> https://lore.kernel.org/xen-devel/[email protected]>
> v6:
> https://lore.kernel.org/xen-devel/[email protected]/
> v5: https://lore.kernel.org/xen-devel/[email protected]/
> v4: https://lore.kernel.org/xen-devel/[email protected]/
> v3:
> https://lore.kernel.org/xen-devel/[email protected]/
> v3:
> https://lore.kernel.org/xen-devel/[email protected]/
> v2:
> https://lore.kernel.org/xen-devel/[email protected]/
> v1: https://lore.kernel.org/xen-devel/[email protected]/
>
>
> Alejandro Vallejo (11):
> x86: Replace arch-specific boot_module with common one
> xen: Refactor kernel_info to have a header like boot_domain
> x86: Replace arch-specific boot_domain with the common one
> xen/dt: Move bootfdt functions to xen/bootfdt.h
> xen/dt: Move bootinfo functions to a new bootinfo.h
> xen/dt: Rename bootfdt.c -> bootinfo-fdt.c
> xen/dt: Extract bootinfo-independent functions to bootfdt.c
> xen/dt: Extract helper to map nodes to module kinds
> xen: Split HAS_DEVICE_TREE in two
> xen/dt: ifdef out DEV_DT-related bits from device_tree.{c,h}
> xen/dt: Allow CONFIG_DEVICE_TREE_PARSE to include device-tree/
Pretty clearly, as per the build-each-commit job in CI, there must have been an
issue in the middle of the series:
In file included from ./arch/x86/include/asm/bootinfo.h:15,
from arch/x86/cpu/microcode/core.c:37:
./arch/x86/include/asm/boot-domain.h:13:8: error: redefinition of 'struct
boot_domain'
13 | struct boot_domain {
| ^~~~~~~~~~~
In file included from ./arch/x86/include/asm/bootinfo.h:11:
./include/xen/bootfdt.h:103:8: note: originally defined here
103 | struct boot_domain {
| ^~~~~~~~~~~
and similarly
In file included from ./arch/x86/include/asm/bootinfo.h:15,
from arch/x86/pv/dom0_build.c:17:
./arch/x86/include/asm/boot-domain.h:13:8: error: redefinition of 'struct
boot_domain'
13 | struct boot_domain {
| ^~~~~~~~~~~
In file included from ./arch/x86/include/asm/bootinfo.h:11:
./include/xen/bootfdt.h:103:8: note: originally defined here
103 | struct boot_domain {
| ^~~~~~~~~~~
Jan
