Re: [PATCH v2 07/18] xen: add PVH specific defines to offset.h

[Daniel Kiper]

On Tue, Oct 09, 2018 at 01:03:06PM +0200, Juergen Gross wrote:
> include/grub/offsets.h needs some defines for Xen PVH mode.
>
> Add them. While at it line up the values in the surrounding lines to
> start at the same column.
>
> Signed-off-by: Juergen Gross <address@hidden>
> ---
>  include/grub/offsets.h | 21 ++++++++++++---------
>  1 file changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/include/grub/offsets.h b/include/grub/offsets.h
> index 330e4c707..b16353163 100644
> --- a/include/grub/offsets.h
> +++ b/include/grub/offsets.h
> @@ -36,9 +36,10 @@
>  #define GRUB_DECOMPRESSOR_I386_PC_MAX_DECOMPRESSOR_SIZE (0x9000-0x8200)
>
>  /* The segment where the kernel is loaded.  */
> -#define GRUB_BOOT_I386_PC_KERNEL_SEG 0x800
> +#define GRUB_BOOT_I386_PC_KERNEL_SEG         0x800
>
> -#define GRUB_KERNEL_I386_PC_LINK_ADDR  0x9000
> +#define GRUB_KERNEL_I386_PC_LINK_ADDR                0x9000
> +#define GRUB_KERNEL_I386_XENPVH_LINK_ADDR    0x100000

s/XENPVH/XEN_PVH/ In general I prefer XEN_PVH instead of XENPVH.
So, please update them all where possible. Not only in this patch.

>  /* The upper memory area (starting at 640 kiB).  */
>  #define GRUB_MEMORY_I386_PC_UPPER            0xa0000
> @@ -101,15 +102,17 @@
>  #define GRUB_KERNEL_I386_MULTIBOOT_MOD_ALIGN 
> GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
>
>  #define GRUB_KERNEL_X86_64_XEN_MOD_ALIGN     0x8
> -#define GRUB_KERNEL_I386_XEN_MOD_ALIGN       0x8
> +#define GRUB_KERNEL_I386_XEN_MOD_ALIGN               0x8
> +#define GRUB_KERNEL_I386_XENPVH_MOD_ALIGN    0x8

Ditto.

>  /* Non-zero value is only needed for PowerMacs.  */
> -#define GRUB_KERNEL_X86_64_XEN_MOD_GAP 0x0
> -#define GRUB_KERNEL_I386_XEN_MOD_GAP 0x0
> -#define GRUB_KERNEL_I386_IEEE1275_MOD_GAP 0x0
> -#define GRUB_KERNEL_I386_COREBOOT_MOD_GAP 0x0
> -#define GRUB_KERNEL_SPARC64_IEEE1275_MOD_GAP 0x0
> -#define GRUB_KERNEL_ARM_UBOOT_MOD_GAP 0x0
> +#define GRUB_KERNEL_X86_64_XEN_MOD_GAP               0x0
> +#define GRUB_KERNEL_I386_XEN_MOD_GAP         0x0
> +#define GRUB_KERNEL_I386_XENPVH_MOD_GAP              0x0

Ditto.

Daniel