diff options
Diffstat (limited to 'main/grub/0008-xen-Add-PVH-specific-defines-to-offset.h.patch')
| -rw-r--r-- | main/grub/0008-xen-Add-PVH-specific-defines-to-offset.h.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/main/grub/0008-xen-Add-PVH-specific-defines-to-offset.h.patch b/main/grub/0008-xen-Add-PVH-specific-defines-to-offset.h.patch new file mode 100644 index 0000000000..b98eb163a4 --- /dev/null +++ b/main/grub/0008-xen-Add-PVH-specific-defines-to-offset.h.patch @@ -0,0 +1,63 @@ +From d0a9f803262b4702c0509d39820b2262d5bd916d Mon Sep 17 00:00:00 2001 +From: Juergen Gross <jgross@suse.com> +Date: Fri, 7 Dec 2018 13:11:36 +0100 +Subject: [PATCH 08/20] xen: Add PVH specific defines to offset.h + +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 <jgross@suse.com> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +Tested-by: Hans van Kranenburg <hans@knorrie.org> +(cherry picked from commit 53a92dea8b675afb3f46aed15c04528695d46d59) +--- + 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 c88c86d4d..8c784a57d 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_XEN_PVH_LINK_ADDR 0x100000 + + /* 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_XEN_PVH_MOD_ALIGN 0x8 + + /* 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_XEN_PVH_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_POWERPC_IEEE1275_MOD_ALIGN 0x1000 + #define GRUB_KERNEL_SPARC64_IEEE1275_LOG_MOD_ALIGN 3 +-- +2.21.0 + |