From: Sebastien Boeuf <sebastien.bo...@intel.com>
Adding some flexibility to the program so that other targets can use it
if needed.
An optional size parameter is added so that we can provide the expected
blob size of the generated binary.
A global define is added so that we can choose at build time if we want
to use 32-bit or 64-bit bases structures.
The default behavior isn't modified.
Signed-off-by: Sebastien Boeuf <sebastien.bo...@intel.com>
---
OvmfPkg/OvmfXenElfHeaderGenerator.c | 63 ++++++++++++++++++++++++-----
1 file changed, 52 insertions(+), 11 deletions(-)
diff --git a/OvmfPkg/OvmfXenElfHeaderGenerator.c
b/OvmfPkg/OvmfXenElfHeaderGenerator.c
index 489060cdad..a054c77cda 100644
--- a/OvmfPkg/OvmfXenElfHeaderGenerator.c
+++ b/OvmfPkg/OvmfXenElfHeaderGenerator.c
@@ -12,6 +12,7 @@
#include "elf.h"
#include "stdio.h"
#include "stddef.h"
+#include "stdlib.h"
void
print_hdr (
@@ -38,7 +39,8 @@ typedef struct {
int
main (
- void
+ int argc,
+ char *argv[]
)
{
/* FW_SIZE */
@@ -47,23 +49,46 @@ main (
uint32_t ovmf_base_address = 0x00100000;
/* Xen PVH entry point */
uint32_t ovmfxen_pvh_entry_point = ovmf_base_address + ovmf_blob_size -
0x30;
- size_t offset_into_file = 0;
+ size_t offset_into_file = 0;
+ char *endptr, *str;
+ long param;
+
+ /* Parse the size parameter */
+ if (argc > 1) {
+ str = argv[1];
+ param = strtol (str, &endptr, 10);
+ if (endptr != str) {
+ ovmf_blob_size = (size_t)param;
+ }
+ }
/* ELF file header */
+ #ifdef PVH64
+ Elf64_Ehdr hdr = {
+ #else
Elf32_Ehdr hdr = {
- .e_ident = ELFMAG,
- .e_type = ET_EXEC,
- .e_machine = EM_386,
- .e_version = EV_CURRENT,
- .e_entry = ovmfxen_pvh_entry_point,
- .e_flags = R_386_NONE,
- .e_ehsize = sizeof (hdr),
+ #endif
+ .e_ident = ELFMAG,
+ .e_type = ET_EXEC,
+ .e_machine = EM_386,
+ .e_version = EV_CURRENT,
+ .e_entry = ovmfxen_pvh_entry_point,
+ .e_flags = R_386_NONE,
+ .e_ehsize = sizeof (hdr),
+ #ifdef PVH64
+ .e_phentsize = sizeof (Elf64_Phdr),
+ #else
.e_phentsize = sizeof (Elf32_Phdr),
+ #endif
};
offset_into_file += sizeof (hdr);
- hdr.e_ident[EI_CLASS] = ELFCLASS32;
+ #ifdef PVH64
+ hdr.e_ident[EI_CLASS] = ELFCLASS64;
+ #else
+ hdr.e_ident[EI_CLASS] = ELFCLASS32;
+ #endif
hdr.e_ident[EI_DATA] = ELFDATA2LSB;
hdr.e_ident[EI_VERSION] = EV_CURRENT;
hdr.e_ident[EI_OSABI] = ELFOSABI_LINUX;
@@ -71,14 +96,22 @@ main (
hdr.e_phoff = sizeof (hdr);
/* program header */
+ #ifdef PVH64
+ Elf64_Phdr phdr_load = {
+ #else
Elf32_Phdr phdr_load = {
+ #endif
.p_type = PT_LOAD,
.p_offset = 0, /* load everything */
.p_paddr = ovmf_base_address,
.p_filesz = ovmf_blob_size,
.p_memsz = ovmf_blob_size,
.p_flags = PF_X | PF_W | PF_R,
+ #ifdef PVH64
+ .p_align = 4,
+ #else
.p_align = 0,
+ #endif
};
phdr_load.p_vaddr = phdr_load.p_paddr;
@@ -98,12 +131,20 @@ main (
sizeof (xen_elfnote_phys32_entry) -
offsetof (xen_elfnote_phys32_entry, desc),
};
- Elf32_Phdr phdr_note = {
+ #ifdef PVH64
+ Elf64_Phdr phdr_note = {
+ #else
+ Elf32_Phdr phdr_note = {
+ #endif
.p_type = PT_NOTE,
.p_filesz = sizeof (xen_elf_note),
.p_memsz = sizeof (xen_elf_note),
.p_flags = PF_R,
+ #ifdef PVH64
+ .p_align = 4,
+ #else
.p_align = 0,
+ #endif
};
hdr.e_phnum += 1;
--
2.32.0
---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris,
92196 Meudon Cedex, France
Registration Number: 302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86912): https://edk2.groups.io/g/devel/message/86912
Mute This Topic: https://groups.io/mt/89345229/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
