aboutsummaryrefslogtreecommitdiff
path: root/hw/mips/mips_mipssim.c
diff options
context:
space:
mode:
authorLiam Merwick <liam.merwick@oracle.com>2019-01-15 12:18:03 +0000
committerPaolo Bonzini <pbonzini@redhat.com>2019-02-05 16:50:16 +0100
commit4366e1db16a3ec7bf24171e5c7619c8ea038e43b (patch)
tree6792ae0a31de33061b9f32b182524e033d91e84d /hw/mips/mips_mipssim.c
parentd455ebc4f827c14a29240db17931e170b6937c6c (diff)
elf: Add optional function ptr to load_elf() to parse ELF notes
This patch adds an optional function pointer, 'elf_note_fn', to load_elf() which causes load_elf() to additionally parse any ELF program headers of type PT_NOTE and check to see if the ELF Note is of the type specified by the 'translate_opaque' arg. If a matching ELF Note is found then the specfied function pointer is called to process the ELF note. Passing a NULL function pointer results in ELF Notes being skipped. The first consumer of this functionality is the PVHboot support which needs to read the XEN_ELFNOTE_PHYS32_ENTRY ELF Note while loading the uncompressed kernel binary in order to discover the boot entry address for the x86/HVM direct boot ABI. Signed-off-by: Liam Merwick <liam.merwick@oracle.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/mips/mips_mipssim.c')
-rw-r--r--hw/mips/mips_mipssim.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index f665752a2f..824abda657 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -69,8 +69,9 @@ static int64_t load_kernel(void)
big_endian = 0;
#endif
- kernel_size = load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys,
- NULL, (uint64_t *)&entry, NULL,
+ kernel_size = load_elf(loaderparams.kernel_filename, NULL,
+ cpu_mips_kseg0_to_phys, NULL,
+ (uint64_t *)&entry, NULL,
(uint64_t *)&kernel_high, big_endian,
EM_MIPS, 1, 0);
if (kernel_size >= 0) {