From mboxrd@z Thu Jan 1 00:00:00 1970 From: Juergen Gross Subject: [PATCH v4 07/19] xen: add PVH specific defines to offset.h Date: Fri, 2 Nov 2018 13:37:26 +0100 Message-ID: <20181102123738.16395-8-jgross@suse.com> References: <20181102123738.16395-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181102123738.16395-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: grub-devel@gnu.org Cc: hans@knorrie.org, phcoder@gmail.com, daniel.kiper@oracle.com, Juergen Gross , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org aW5jbHVkZS9ncnViL29mZnNldHMuaCBuZWVkcyBzb21lIGRlZmluZXMgZm9yIFhlbiBQVkggbW9k ZS4KCkFkZCB0aGVtLiBXaGlsZSBhdCBpdCBsaW5lIHVwIHRoZSB2YWx1ZXMgaW4gdGhlIHN1cnJv dW5kaW5nIGxpbmVzIHRvCnN0YXJ0IGF0IHRoZSBzYW1lIGNvbHVtbi4KClNpZ25lZC1vZmYtYnk6 IEp1ZXJnZW4gR3Jvc3MgPGpncm9zc0BzdXNlLmNvbT4KLS0tClYzOiBYRU5QVkgtPlhFTl9QVkgg KERhbmllbCBLaXBlcikKLS0tCiBpbmNsdWRlL2dydWIvb2Zmc2V0cy5oIHwgMjEgKysrKysrKysr KysrLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRlL2dydWIvb2Zmc2V0cy5oIGIvaW5jbHVkZS9ncnVi L29mZnNldHMuaAppbmRleCAzMzBlNGM3MDcuLjg3MWUxY2Q0YyAxMDA2NDQKLS0tIGEvaW5jbHVk ZS9ncnViL29mZnNldHMuaAorKysgYi9pbmNsdWRlL2dydWIvb2Zmc2V0cy5oCkBAIC0zNiw5ICsz NiwxMCBAQAogI2RlZmluZSBHUlVCX0RFQ09NUFJFU1NPUl9JMzg2X1BDX01BWF9ERUNPTVBSRVNT T1JfU0laRSAoMHg5MDAwLTB4ODIwMCkKIAogLyogVGhlIHNlZ21lbnQgd2hlcmUgdGhlIGtlcm5l bCBpcyBsb2FkZWQuICAqLwotI2RlZmluZSBHUlVCX0JPT1RfSTM4Nl9QQ19LRVJORUxfU0VHCTB4 ODAwCisjZGVmaW5lIEdSVUJfQk9PVF9JMzg2X1BDX0tFUk5FTF9TRUcJCTB4ODAwCiAKLSNkZWZp bmUgR1JVQl9LRVJORUxfSTM4Nl9QQ19MSU5LX0FERFIgIDB4OTAwMAorI2RlZmluZSBHUlVCX0tF Uk5FTF9JMzg2X1BDX0xJTktfQUREUgkJMHg5MDAwCisjZGVmaW5lIEdSVUJfS0VSTkVMX0kzODZf WEVOX1BWSF9MSU5LX0FERFIJMHgxMDAwMDAKIAogLyogVGhlIHVwcGVyIG1lbW9yeSBhcmVhIChz dGFydGluZyBhdCA2NDAga2lCKS4gICovCiAjZGVmaW5lIEdSVUJfTUVNT1JZX0kzODZfUENfVVBQ RVIJCTB4YTAwMDAKQEAgLTEwMSwxNSArMTAyLDE3IEBACiAjZGVmaW5lIEdSVUJfS0VSTkVMX0kz ODZfTVVMVElCT09UX01PRF9BTElHTglHUlVCX0tFUk5FTF9JMzg2X0NPUkVCT09UX01PRF9BTElH TgogCiAjZGVmaW5lIEdSVUJfS0VSTkVMX1g4Nl82NF9YRU5fTU9EX0FMSUdOCTB4OAotI2RlZmlu ZSBHUlVCX0tFUk5FTF9JMzg2X1hFTl9NT0RfQUxJR04JMHg4CisjZGVmaW5lIEdSVUJfS0VSTkVM X0kzODZfWEVOX01PRF9BTElHTgkJMHg4CisjZGVmaW5lIEdSVUJfS0VSTkVMX0kzODZfWEVOX1BW SF9NT0RfQUxJR04JMHg4CiAKIC8qIE5vbi16ZXJvIHZhbHVlIGlzIG9ubHkgbmVlZGVkIGZvciBQ b3dlck1hY3MuICAqLwotI2RlZmluZSBHUlVCX0tFUk5FTF9YODZfNjRfWEVOX01PRF9HQVAgMHgw Ci0jZGVmaW5lIEdSVUJfS0VSTkVMX0kzODZfWEVOX01PRF9HQVAgMHgwCi0jZGVmaW5lIEdSVUJf S0VSTkVMX0kzODZfSUVFRTEyNzVfTU9EX0dBUCAweDAKLSNkZWZpbmUgR1JVQl9LRVJORUxfSTM4 Nl9DT1JFQk9PVF9NT0RfR0FQIDB4MAotI2RlZmluZSBHUlVCX0tFUk5FTF9TUEFSQzY0X0lFRUUx Mjc1X01PRF9HQVAgMHgwCi0jZGVmaW5lIEdSVUJfS0VSTkVMX0FSTV9VQk9PVF9NT0RfR0FQIDB4 MAorI2RlZmluZSBHUlVCX0tFUk5FTF9YODZfNjRfWEVOX01PRF9HQVAJCTB4MAorI2RlZmluZSBH UlVCX0tFUk5FTF9JMzg2X1hFTl9NT0RfR0FQCQkweDAKKyNkZWZpbmUgR1JVQl9LRVJORUxfSTM4 Nl9YRU5fUFZIX01PRF9HQVAJMHgwCisjZGVmaW5lIEdSVUJfS0VSTkVMX0kzODZfSUVFRTEyNzVf TU9EX0dBUAkweDAKKyNkZWZpbmUgR1JVQl9LRVJORUxfSTM4Nl9DT1JFQk9PVF9NT0RfR0FQCTB4 MAorI2RlZmluZSBHUlVCX0tFUk5FTF9TUEFSQzY0X0lFRUUxMjc1X01PRF9HQVAJMHgwCisjZGVm aW5lIEdSVUJfS0VSTkVMX0FSTV9VQk9PVF9NT0RfR0FQCQkweDAKIAogI2RlZmluZSBHUlVCX0tF Uk5FTF9QT1dFUlBDX0lFRUUxMjc1X01PRF9BTElHTiAweDEwMDAKICNkZWZpbmUgR1JVQl9LRVJO RUxfU1BBUkM2NF9JRUVFMTI3NV9MT0dfTU9EX0FMSUdOIDMKLS0gCjIuMTYuNAoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5n IGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJv amVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1gIYwb-0007Ac-Lr for mharc-grub-devel@gnu.org; Fri, 02 Nov 2018 08:52:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIYwR-0005QI-HZ for grub-devel@gnu.org; Fri, 02 Nov 2018 08:52:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIYhv-00053D-UZ for grub-devel@gnu.org; Fri, 02 Nov 2018 08:37:49 -0400 Received: from mx2.suse.de ([195.135.220.15]:50236 helo=mx1.suse.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIYhv-00052P-Hu for grub-devel@gnu.org; Fri, 02 Nov 2018 08:37:47 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id A3804ADFE; Fri, 2 Nov 2018 12:37:42 +0000 (UTC) From: Juergen Gross To: grub-devel@gnu.org Cc: xen-devel@lists.xen.org, phcoder@gmail.com, daniel.kiper@oracle.com, hans@knorrie.org, Juergen Gross Subject: [PATCH v4 07/19] xen: add PVH specific defines to offset.h Date: Fri, 2 Nov 2018 13:37:26 +0100 Message-Id: <20181102123738.16395-8-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181102123738.16395-1-jgross@suse.com> References: <20181102123738.16395-1-jgross@suse.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2018 12:52:49 -0000 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 --- 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