All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juergen Gross <jgross@suse.com>
To: grub-devel@gnu.org
Cc: hans@knorrie.org, phcoder@gmail.com, daniel.kiper@oracle.com,
	Juergen Gross <jgross@suse.com>,
	xen-devel@lists.xen.org
Subject: [PATCH v4 07/19] xen: add PVH specific defines to offset.h
Date: Fri,  2 Nov 2018 13:37:26 +0100	[thread overview]
Message-ID: <20181102123738.16395-8-jgross@suse.com> (raw)
In-Reply-To: <20181102123738.16395-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>
---
V3: XENPVH->XEN_PVH (Daniel Kiper)
---
 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..871e1cd4c 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.16.4


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

WARNING: multiple messages have this Message-ID (diff)
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 v4 07/19] xen: add PVH specific defines to offset.h
Date: Fri,  2 Nov 2018 13:37:26 +0100	[thread overview]
Message-ID: <20181102123738.16395-8-jgross@suse.com> (raw)
In-Reply-To: <20181102123738.16395-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>
---
V3: XENPVH->XEN_PVH (Daniel Kiper)
---
 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..871e1cd4c 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.16.4



  parent reply	other threads:[~2018-11-02 12:37 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-02 12:37 [PATCH v4 00/19] xen: add pvh guest support Juergen Gross
2018-11-02 12:37 ` Juergen Gross
2018-11-02 12:37 ` [PATCH v4 01/19] xen: add some xen headers Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-02 12:37 ` [PATCH v4 02/19] loader/linux: support passing rsdp address via boot params Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-07 11:36   ` Daniel Kiper
2018-11-07 11:36   ` Daniel Kiper
2018-11-02 12:37 ` [PATCH v4 03/19] xen: carve out grant tab initialization into dedicated function Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-02 12:37 ` [PATCH v4 04/19] xen: prepare common code for Xen PVH support Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-07 12:10   ` Daniel Kiper
2018-11-07 12:10   ` Daniel Kiper
2018-11-02 12:37 ` [PATCH v4 05/19] xen: add some dummy headers for PVH mode Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-07 12:21   ` Daniel Kiper
2018-11-07 12:21     ` Daniel Kiper
2018-11-07 14:49     ` Juergen Gross
2018-11-08 15:36       ` Daniel Kiper
2018-11-08 15:36       ` Daniel Kiper
2018-11-08 15:40         ` Juergen Gross
2018-11-08 15:40         ` Juergen Gross
2018-11-07 14:49     ` Juergen Gross
2018-11-02 12:37 ` [PATCH v4 06/19] xen: rearrange xen/init.c to prepare it for Xen " Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-02 12:37 ` Juergen Gross [this message]
2018-11-02 12:37   ` [PATCH v4 07/19] xen: add PVH specific defines to offset.h Juergen Gross
2018-11-07 12:27   ` Daniel Kiper
2018-11-07 12:27     ` Daniel Kiper
2018-11-02 12:37 ` [PATCH v4 08/19] xen: add basic hooks for PVH in current code Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-08 15:45   ` Daniel Kiper
2018-11-08 19:23     ` [Xen-devel] " Juergen Gross
2018-11-09 17:55       ` Daniel Kiper
2018-11-09 17:55       ` Daniel Kiper
2018-11-08 19:23     ` Juergen Gross
2018-11-08 15:45   ` Daniel Kiper
2018-11-02 12:37 ` [PATCH v4 09/19] xen: add PVH boot entry code Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-08 15:53   ` Daniel Kiper
2018-11-08 15:53   ` Daniel Kiper
2018-11-02 12:37 ` [PATCH v4 10/19] xen: setup hypercall page for PVH Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-09 18:12   ` Daniel Kiper
2018-11-09 18:12     ` Daniel Kiper
2018-11-20  9:27     ` Juergen Gross
2018-11-20  9:27       ` Juergen Gross
2018-11-21 13:58       ` Juergen Gross
2018-11-21 13:58         ` [Xen-devel] " Juergen Gross
2018-11-15  8:33   ` Roger Pau Monné
2018-11-20  9:16     ` Juergen Gross
2018-11-20  9:16     ` Juergen Gross
2018-11-15  8:33   ` Roger Pau Monné
2018-11-02 12:37 ` [PATCH v4 11/19] xen: get memory map from hypervisor " Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-09 18:35   ` Daniel Kiper
2018-11-09 18:35   ` Daniel Kiper
2018-11-15  9:36   ` [Xen-devel] " Roger Pau Monné
2018-11-21  8:52     ` Juergen Gross
2018-11-21  8:52     ` Juergen Gross
2018-11-15  9:36   ` Roger Pau Monné
2018-11-02 12:37 ` [PATCH v4 12/19] xen: add PCI MMIO areas to memory map Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-09 19:14   ` Daniel Kiper
2018-11-14 12:49     ` Roger Pau Monné
2018-11-14 12:49       ` [Xen-devel] " Roger Pau Monné
2018-11-14 15:30       ` Daniel Kiper
2018-11-14 15:30       ` Daniel Kiper
2018-11-09 19:14   ` Daniel Kiper
2018-11-14 12:48   ` Roger Pau Monné
2018-11-14 12:48     ` [Xen-devel] " Roger Pau Monné
2018-11-21  9:02     ` Juergen Gross
2018-11-21  9:02     ` Juergen Gross
2018-11-02 12:37 ` [PATCH v4 13/19] xen: setup Xen specific data for PVH Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-09 19:47   ` Daniel Kiper
2018-11-09 19:47   ` Daniel Kiper
2018-11-15 10:03   ` [Xen-devel] " Roger Pau Monné
2018-11-21  9:07     ` Juergen Gross
2018-11-21  9:07     ` Juergen Gross
2018-11-15 10:03   ` Roger Pau Monné
2018-11-02 12:37 ` [PATCH v4 14/19] xen: init memory regions " Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-09 19:56   ` Daniel Kiper
2018-11-09 19:56   ` Daniel Kiper
2018-11-15 10:07   ` Roger Pau Monné
2018-11-15 10:07     ` [Xen-devel] " Roger Pau Monné
2018-11-02 12:37 ` [PATCH v4 15/19] xen_pvh: add build runes for grub-core Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-02 12:37 ` [PATCH v4 16/19] grub-module-verifier: Ignore all_video for xenpvh Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-02 12:37 ` [PATCH v4 17/19] xen_pvh: support building a standalone image Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-09 20:06   ` Daniel Kiper
2018-11-09 20:06   ` Daniel Kiper
2018-11-02 12:37 ` [PATCH v4 18/19] xen_pvh: support grub-install for xen_pvh Juergen Gross
2018-11-02 12:37   ` Juergen Gross
2018-11-02 12:37 ` [PATCH v4 19/19] xen_pvh: add support to configure Juergen Gross
2018-11-02 12:37   ` 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=20181102123738.16395-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.