summaryrefslogtreecommitdiffstats
path: root/hw/openrisc
diff options
context:
space:
mode:
authorLiam Merwick2019-01-15 13:18:03 +0100
committerPaolo Bonzini2019-02-05 16:50:16 +0100
commit4366e1db16a3ec7bf24171e5c7619c8ea038e43b (patch)
tree6792ae0a31de33061b9f32b182524e033d91e84d /hw/openrisc
parentcpus: ignore ESRCH in qemu_cpu_kick_thread() (diff)
downloadqemu-4366e1db16a3ec7bf24171e5c7619c8ea038e43b.tar.gz
qemu-4366e1db16a3ec7bf24171e5c7619c8ea038e43b.tar.xz
qemu-4366e1db16a3ec7bf24171e5c7619c8ea038e43b.zip
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/openrisc')
-rw-r--r--hw/openrisc/openrisc_sim.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index a495a84a41..7d3b734d24 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -96,7 +96,7 @@ static void openrisc_load_kernel(ram_addr_t ram_size,
hwaddr entry;
if (kernel_filename && !qtest_enabled()) {
- kernel_size = load_elf(kernel_filename, NULL, NULL,
+ kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&elf_entry, NULL, NULL, 1, EM_OPENRISC,
1, 0);
entry = elf_entry;