Re: [XEN PATCH v7 14/51] xen: move include/asm-* to arch/*/include/asm

[Jan Beulich <jbeulich@xxxxxxxx>]

On 24.08.2021 12:50, Anthony PERARD wrote:
> This avoid the need to create the symbolic link "include/asm".
> 
> Whenever a comment refer to an "asm" headers, this patch avoid
> spelling the arch when not needed to avoid some code churn.
> 
> One unrelated change is to sort entries in MAINTAINERS for "INTEL(R)
> VT FOR X86 (VT-X)"

Actually that misplaced entry isn't really that much VT-x related and
hence would imo better be dropped from there. But I can see that such
dropping would be less suitable of a change here.

> --- a/tools/include/Makefile
> +++ b/tools/include/Makefile
> @@ -30,7 +30,7 @@ xen-dir:
>       ln -s $(XEN_ROOT)/xen/include/acpi/platform acpi/
>       ln -s $(XEN_ROOT)/xen/include/acpi/ac*.h acpi/
>  ifeq ($(CONFIG_X86),y)
> -     ln -s $(XEN_ROOT)/xen/include/asm-x86 xen/asm
> +     ln -s $(XEN_ROOT)/xen/arch/x86/include/asm xen/asm

I think this would now better be

        ln -s $(XEN_ROOT)/xen/arch/x86/include/asm xen/

matching what is visible in context.

> --- a/xen/arch/riscv/arch.mk
> +++ b/xen/arch/riscv/arch.mk
> @@ -12,3 +12,4 @@ riscv-march-$(CONFIG_RISCV_ISA_C)       := $(riscv-march-y)c
>  
>  CFLAGS += -march=$(riscv-march-y) -mstrict-align -mcmodel=medany
>  CFLAGS += -I$(BASEDIR)/include
> +CFLAGS += -I$(BASEDIR)/arch/$(TARGET_ARCH)/include

I find it odd that this needed repeating in every arch.mk. Can't
this be done once for all arches?

> --- a/xen/common/page_alloc.c
> +++ b/xen/common/page_alloc.c
> @@ -241,7 +241,7 @@ PAGE_LIST_HEAD(page_broken_list);
>  
>  /*
>   * first_valid_mfn is exported because it is use in ARM specific NUMA
> - * helpers. See comment in asm-arm/numa.h.
> + * helpers. See comment in asm/numa.h.
>   */
>  mfn_t first_valid_mfn = INVALID_MFN_INITIALIZER;

I'm afraid that in this case it is relevant that it's Arm's header,
like ...

> --- a/xen/include/xen/acpi.h
> +++ b/xen/include/xen/acpi.h
> @@ -40,8 +40,9 @@
>  #define ACPI_MADT_GET_TRIGGER(inti)  ACPI_MADT_GET_(TRIGGER, inti)
>  
>  /*
> - * Fixmap pages to reserve for ACPI boot-time tables (see asm-x86/fixmap.h or
> - * asm-arm/config.h, 64 pages(256KB) is large enough for most cases.)
> + * Fixmap pages to reserve for ACPI boot-time tables (see
> + * arch/x86/include/asm/fixmap.h or arch/arm/include/asm/config.h,
> + * 64 pages(256KB) is large enough for most cases.)

... you arrange for here.

Jan