aboutsummaryrefslogtreecommitdiff
path: root/hw/alpha
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/alpha
parentd455ebc4f827c14a29240db17931e170b6937c6c (diff)
downloadqemu-4366e1db16a3ec7bf24171e5c7619c8ea038e43b.zip
qemu-4366e1db16a3ec7bf24171e5c7619c8ea038e43b.tar.gz
qemu-4366e1db16a3ec7bf24171e5c7619c8ea038e43b.tar.bz2
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/alpha')
-rw-r--r--hw/alpha/dp264.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index dd62f2a..0347eb8 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -114,7 +114,7 @@ static void clipper_init(MachineState *machine)
error_report("no palcode provided");
exit(1);
}
- size = load_elf(palcode_filename, cpu_alpha_superpage_to_phys,
+ size = load_elf(palcode_filename, NULL, cpu_alpha_superpage_to_phys,
NULL, &palcode_entry, &palcode_low, &palcode_high,
0, EM_ALPHA, 0, 0);
if (size < 0) {
@@ -133,7 +133,7 @@ static void clipper_init(MachineState *machine)
if (kernel_filename) {
uint64_t param_offset;
- size = load_elf(kernel_filename, cpu_alpha_superpage_to_phys,
+ size = load_elf(kernel_filename, NULL, cpu_alpha_superpage_to_phys,
NULL, &kernel_entry, &kernel_low, &kernel_high,
0, EM_ALPHA, 0, 0);
if (size < 0) {