Re: [Xen-devel] [PATCH v4 22/23] xen/arm: move kernel.h to asm-arm/

[Julien Grall <julien.grall@xxxxxxx>]

Hi Stefano,

On 05/10/2018 19:47, Stefano Stabellini wrote:
> It will be #included by a file in a xen/arch/arm subdirectory.
>
> Signed-off-by: Stefano Stabellini <stefanos@xxxxxxxxxx>
> ---
>   xen/arch/arm/domain_build.c  |  2 +-
>   xen/arch/arm/kernel.c        |  3 +-
>   xen/arch/arm/kernel.h        | 86 --------------------------------------------
>   xen/include/asm-arm/kernel.h | 86 ++++++++++++++++++++++++++++++++++++++++++++
There are way to make git diff nicer for code movement. This seems to be 
done by default on 2.11.0. Not sure for older version. What are you using?
>   4 files changed, 88 insertions(+), 89 deletions(-)
>   delete mode 100644 xen/arch/arm/kernel.h
>   create mode 100644 xen/include/asm-arm/kernel.h
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 4379538..dc9b46e 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -16,6 +16,7 @@
>   #include <xen/warning.h>
>   #include <acpi/actables.h>
>   #include <asm/device.h>
> +#include <asm/kernel.h>
>   #include <asm/setup.h>
>   #include <asm/platform.h>
>   #include <asm/psci.h>
> @@ -24,7 +25,6 @@
>   
>   #include <xen/irq.h>
>   #include <xen/grant_table.h>
> -#include "kernel.h"
>   
>   static unsigned int __initdata opt_dom0_max_vcpus;
>   integer_param("dom0_max_vcpus", opt_dom0_max_vcpus);
> diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
> index 2239a07..b56aa79 100644
> --- a/xen/arch/arm/kernel.c
> +++ b/xen/arch/arm/kernel.c
> @@ -16,8 +16,7 @@
>   #include <xen/vmap.h>
>   
>   #include <asm/guest_access.h>
> -
> -#include "kernel.h"
> +#include <asm/kernel.h>
>   
>   #define UIMAGE_MAGIC          0x27051956
>   #define UIMAGE_NMLEN          32
> diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h
> deleted file mode 100644
> index 33f3e72..0000000
> --- a/xen/arch/arm/kernel.h
> +++ /dev/null
> @@ -1,86 +0,0 @@
> -/*
> - * Kernel image loading.
> - *
> - * Copyright (C) 2011 Citrix Systems, Inc.
> - */
> -#ifndef __ARCH_ARM_KERNEL_H__
> -#define __ARCH_ARM_KERNEL_H__
> -
> -#include <xen/device_tree.h>
> -#include <asm/setup.h>
> -
> -struct kernel_info {
> -#ifdef CONFIG_ARM_64
> -    enum domain_type type;
> -#endif
> -
> -    struct domain *d;
> -
> -    void *fdt; /* flat device tree */
> -    paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */
> -    struct meminfo mem;
> -
> -    /* kernel entry point */
> -    paddr_t entry;
> -
> -    /* grant table region */
> -    paddr_t gnttab_start;
> -    paddr_t gnttab_size;
> -
> -    /* boot blob load addresses */
> -    const struct bootmodule *kernel_bootmodule, *initrd_bootmodule;
> -    const char* cmdline;
> -    paddr_t dtb_paddr;
> -    paddr_t initrd_paddr;
> -
> -    /* Enable pl011 emulation */
> -    bool vpl011;
> -
> -    /* loader to use for this kernel */
> -    void (*load)(struct kernel_info *info);
> -    /* loader specific state */
> -    union {
> -        struct {
> -            paddr_t kernel_addr;
> -            paddr_t len;
> -#ifdef CONFIG_ARM_64
> -            paddr_t text_offset; /* 64-bit Image only */
> -#endif
> -            paddr_t start; /* 32-bit zImage only */
> -        } zimage;
> -    };
> -};
> -
> -/*
> - * Probe the kernel to detemine its type and select a loader.
> - *
> - * Sets in info:
> - *  ->type
> - *  ->load hook, and sets loader specific variables ->zimage
> - */
> -int kernel_probe(struct kernel_info *info, const struct dt_device_node 
> *domain);
> -
> -/*
> - * Loads the kernel into guest RAM.
> - *
> - * Expects to be set in info when called:
> - *  ->mem
> - *  ->fdt
> - *
> - * Sets in info:
> - *  ->entry
> - *  ->dtb_paddr
> - *  ->initrd_paddr
> - */
> -void kernel_load(struct kernel_info *info);
> -
> -#endif /* #ifdef __ARCH_ARM_KERNEL_H__ */
> -
> -/*
> - * Local variables:
> - * mode: C
> - * c-file-style: "BSD"
> - * c-basic-offset: 4
> - * indent-tabs-mode: nil
> - * End:
> - */
> diff --git a/xen/include/asm-arm/kernel.h b/xen/include/asm-arm/kernel.h
> new file mode 100644
> index 0000000..33f3e72
> --- /dev/null
> +++ b/xen/include/asm-arm/kernel.h
> @@ -0,0 +1,86 @@
> +/*
> + * Kernel image loading.
> + *
> + * Copyright (C) 2011 Citrix Systems, Inc.
> + */
> +#ifndef __ARCH_ARM_KERNEL_H__
> +#define __ARCH_ARM_KERNEL_H__
> +
> +#include <xen/device_tree.h>
> +#include <asm/setup.h>
> +
> +struct kernel_info {
> +#ifdef CONFIG_ARM_64
> +    enum domain_type type;
> +#endif
> +
> +    struct domain *d;
> +
> +    void *fdt; /* flat device tree */
> +    paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */
> +    struct meminfo mem;
> +
> +    /* kernel entry point */
> +    paddr_t entry;
> +
> +    /* grant table region */
> +    paddr_t gnttab_start;
> +    paddr_t gnttab_size;
> +
> +    /* boot blob load addresses */
> +    const struct bootmodule *kernel_bootmodule, *initrd_bootmodule;
> +    const char* cmdline;
> +    paddr_t dtb_paddr;
> +    paddr_t initrd_paddr;
> +
> +    /* Enable pl011 emulation */
> +    bool vpl011;
> +
> +    /* loader to use for this kernel */
> +    void (*load)(struct kernel_info *info);
> +    /* loader specific state */
> +    union {
> +        struct {
> +            paddr_t kernel_addr;
> +            paddr_t len;
> +#ifdef CONFIG_ARM_64
> +            paddr_t text_offset; /* 64-bit Image only */
> +#endif
> +            paddr_t start; /* 32-bit zImage only */
> +        } zimage;
> +    };
> +};
> +
> +/*
> + * Probe the kernel to detemine its type and select a loader.
> + *
> + * Sets in info:
> + *  ->type
> + *  ->load hook, and sets loader specific variables ->zimage
> + */
> +int kernel_probe(struct kernel_info *info, const struct dt_device_node 
> *domain);
> +
> +/*
> + * Loads the kernel into guest RAM.
> + *
> + * Expects to be set in info when called:
> + *  ->mem
> + *  ->fdt
> + *
> + * Sets in info:
> + *  ->entry
> + *  ->dtb_paddr
> + *  ->initrd_paddr
> + */
> +void kernel_load(struct kernel_info *info);
> +
> +#endif /* #ifdef __ARCH_ARM_KERNEL_H__ */
> +
> +/*
> + * Local variables:
> + * mode: C
> + * c-file-style: "BSD"
> + * c-basic-offset: 4
> + * indent-tabs-mode: nil
> + * End:
> + */
--
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel