On Fri, 30 May 2025, Alejandro Vallejo wrote: > Part of an unpicking process to extract bootfdt contents independent of > bootinfo to a separate file for x86 to take. > > With this, bootfdt.h can be cleanly included from x86. A later patch > extracts the definitions so the functions may be called too. > > Not a functional change. > > Signed-off-by: Alejandro Vallejo <agarc...@amd.com> > --- > xen/arch/arm/domain_build.c | 1 + > xen/arch/arm/mmu/mm.c | 1 + > xen/arch/riscv/mm.c | 2 +- > xen/arch/riscv/setup.c | 2 +- > xen/common/device-tree/bootfdt.c | 1 + > xen/common/device-tree/bootinfo.c | 2 +- > xen/common/device-tree/dom0less-build.c | 2 +- > xen/common/device-tree/domain-build.c | 2 +- > xen/common/device-tree/kernel.c | 2 +- > xen/include/xen/bootfdt.h | 206 ----------------------- > xen/include/xen/bootinfo.h | 212 ++++++++++++++++++++++++ > xen/include/xen/device_tree.h | 2 +- > xen/include/xen/fdt-domain-build.h | 2 +- > xen/include/xen/fdt-kernel.h | 2 +- > 14 files changed, 224 insertions(+), 215 deletions(-) > create mode 100644 xen/include/xen/bootinfo.h > > diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c > index 11cc03e5db..c53da76682 100644 > --- a/xen/arch/arm/domain_build.c > +++ b/xen/arch/arm/domain_build.c > @@ -1,5 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0-only */ > #include <xen/init.h> > +#include <xen/bootinfo.h> > #include <xen/compile.h> > #include <xen/fdt-domain-build.h> > #include <xen/fdt-kernel.h> > diff --git a/xen/arch/arm/mmu/mm.c b/xen/arch/arm/mmu/mm.c > index 9c50479c63..77f82757bb 100644 > --- a/xen/arch/arm/mmu/mm.c > +++ b/xen/arch/arm/mmu/mm.c > @@ -1,5 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0-or-later */ > > +#include <xen/bootinfo.h> > #include <xen/init.h> > #include <xen/lib.h> > #include <xen/macros.h> > diff --git a/xen/arch/riscv/mm.c b/xen/arch/riscv/mm.c > index d3ece9f132..040db73d00 100644 > --- a/xen/arch/riscv/mm.c > +++ b/xen/arch/riscv/mm.c > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0-only */ > > -#include <xen/bootfdt.h> > +#include <xen/bootinfo.h> > #include <xen/bug.h> > #include <xen/compiler.h> > #include <xen/init.h> > diff --git a/xen/arch/riscv/setup.c b/xen/arch/riscv/setup.c > index 4e416f6e44..0a2d0dc1eb 100644 > --- a/xen/arch/riscv/setup.c > +++ b/xen/arch/riscv/setup.c > @@ -2,7 +2,7 @@ > > #include <xen/acpi.h> > #include <xen/bug.h> > -#include <xen/bootfdt.h> > +#include <xen/bootinfo.h> > #include <xen/compile.h> > #include <xen/device_tree.h> > #include <xen/init.h> > diff --git a/xen/common/device-tree/bootfdt.c > b/xen/common/device-tree/bootfdt.c > index 529c91e603..fb4ac06390 100644 > --- a/xen/common/device-tree/bootfdt.c > +++ b/xen/common/device-tree/bootfdt.c > @@ -6,6 +6,7 @@ > */ > > #include <xen/bootfdt.h>
Is this kept on purpose? > +#include <xen/bootinfo.h> > #include <xen/device_tree.h> > #include <xen/efi.h> > #include <xen/init.h>
