On 02/09/2024 1:07 pm, Jan Beulich wrote: > On 02.09.2024 13:59, Andrew Cooper wrote: >> --- a/xen/arch/x86/boot/cmdline.c >> +++ b/xen/arch/x86/boot/cmdline.c >> @@ -31,6 +31,8 @@ asm ( >> ); >> >> #include <xen/kconfig.h> >> +#include <xen/types.h> > And why not include the file centrally ... > >> --- a/xen/arch/x86/boot/defs.h >> +++ b/xen/arch/x86/boot/defs.h >> @@ -20,14 +20,10 @@ >> #ifndef __BOOT_DEFS_H__ >> #define __BOOT_DEFS_H__ >> >> -#include <xen/stdbool.h> > ... here? Both above and ... > >> --- a/xen/arch/x86/boot/reloc.c >> +++ b/xen/arch/x86/boot/reloc.c >> @@ -26,6 +26,8 @@ asm ( >> " jmp reloc \n" >> ); >> >> +#include <xen/types.h> >> + >> #include "defs.h" > ... here you have the inclusion ahead of that of defs.h, so there aren't > any other dependencies (unless something subtle is going on).
Because I intend to delete defs.h entirely. I've had a bit of fun unpicking __stdcall (looking to remove it entirely, and replace with fastcall), and we need to shuffle a couple more macros into macros.h, but all of defs.h can be replaced with types.h, compiler.h and macros.h The other problem right now (forcing the order of inclusion here), is that multiboot*.h implicitly use types.h. ~Andrew
