From: Juergen Gross <jgross@suse.com>
To: grub-devel@gnu.org
Cc: xen-devel@lists.xen.org, phcoder@gmail.com,
daniel.kiper@oracle.com, hans@knorrie.org,
Juergen Gross <jgross@suse.com>
Subject: [PATCH v2 07/18] xen: add PVH specific defines to offset.h
Date: Tue, 9 Oct 2018 13:03:06 +0200 [thread overview]
Message-ID: <20181009110317.6022-8-jgross@suse.com> (raw)
In-Reply-To: <20181009110317.6022-1-jgross@suse.com>
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>
---
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
/* 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
/* 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
+#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.16.4
next prev parent reply other threads:[~2018-10-09 11:03 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-09 11:02 [PATCH v2 00/18] xen: add pvh guest support Juergen Gross
2018-10-09 11:03 ` [PATCH v2 01/18] xen: add some xen headers Juergen Gross
2018-10-18 13:45 ` Daniel Kiper
2018-10-18 14:04 ` Juergen Gross
2018-10-18 14:14 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 02/18] loader/linux: support passing rsdp address via boot params Juergen Gross
2018-10-18 14:13 ` Daniel Kiper
2018-10-18 14:18 ` Juergen Gross
2018-10-18 14:30 ` Daniel Kiper
2018-10-18 14:36 ` Juergen Gross
2018-10-18 14:48 ` Daniel Kiper
2018-10-18 14:53 ` Juergen Gross
2018-10-18 15:01 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 03/18] xen: carve out grant tab initialization into dedicated function Juergen Gross
2018-10-18 14:35 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 04/18] xen: prepare common code for Xen PVH support Juergen Gross
2018-10-18 14:59 ` Daniel Kiper
2018-10-18 15:39 ` Juergen Gross
2018-10-19 6:36 ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` [PATCH v2 05/18] xen: add some dummy headers for PVH mode Juergen Gross
2018-10-18 15:19 ` Daniel Kiper
2018-10-18 15:40 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 06/18] xen: rearrange xen/init.c to prepare it for Xen " Juergen Gross
2018-10-18 17:55 ` Daniel Kiper
2018-10-09 11:03 ` Juergen Gross [this message]
2018-10-19 11:54 ` [PATCH v2 07/18] xen: add PVH specific defines to offset.h Daniel Kiper
2018-10-19 14:39 ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` [PATCH v2 08/18] xen: add basic hooks for PVH in current code Juergen Gross
2018-10-19 12:05 ` Daniel Kiper
2018-10-19 14:40 ` [Xen-devel] " Juergen Gross
2018-10-19 15:33 ` Roger Pau Monné
2018-10-19 15:52 ` Juergen Gross
2018-10-22 11:16 ` Daniel Kiper
2018-10-22 11:18 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 09/18] xen: add PVH boot entry code Juergen Gross
2018-10-19 12:17 ` Daniel Kiper
2018-10-19 14:50 ` [Xen-devel] " Juergen Gross
2018-10-22 11:18 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 10/18] xen: setup hypercall page for PVH Juergen Gross
2018-10-19 12:30 ` Daniel Kiper
2018-10-19 12:48 ` [Xen-devel] " Andrew Cooper
2018-10-19 15:01 ` Juergen Gross
2018-10-19 15:40 ` Roger Pau Monné
2018-10-19 15:59 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 11/18] xen: get memory map from hypervisor " Juergen Gross
2018-10-19 12:40 ` Daniel Kiper
2018-10-19 15:06 ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` [PATCH v2 12/18] xen: setup Xen specific data " Juergen Gross
2018-10-19 12:48 ` Daniel Kiper
2018-10-19 15:10 ` [Xen-devel] " Juergen Gross
2018-10-24 14:01 ` Juergen Gross
2018-10-19 15:46 ` Roger Pau Monné
2018-10-19 16:10 ` Roger Pau Monné
2018-10-19 16:39 ` Juergen Gross
2018-10-29 12:57 ` Roger Pau Monné
2018-10-29 14:19 ` Juergen Gross
2018-10-30 11:23 ` Roger Pau Monné
2018-10-30 12:12 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 13/18] xen: init memory regions " Juergen Gross
2018-10-22 11:31 ` Daniel Kiper
2018-10-22 11:43 ` Juergen Gross
2018-10-22 12:08 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 14/18] xenpvh: add build runes for grub-core Juergen Gross
2018-10-22 11:41 ` Daniel Kiper
2018-10-22 11:45 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 15/18] grub-module-verifier: Ignore all_video for xenpvh Juergen Gross
2018-10-22 11:45 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 16/18] xenpvh: support building a standalone image Juergen Gross
2018-10-22 11:56 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 17/18] xenpvh: support grub-install for xenpvh Juergen Gross
2018-10-22 12:01 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 18/18] xenpvh: add support to configure Juergen Gross
2018-10-22 12:04 ` Daniel Kiper
2018-10-10 15:59 ` [Xen-devel] [PATCH v2 00/18] xen: add pvh guest support Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181009110317.6022-8-jgross@suse.com \
--to=jgross@suse.com \
--cc=daniel.kiper@oracle.com \
--cc=grub-devel@gnu.org \
--cc=hans@knorrie.org \
--cc=phcoder@gmail.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).