mirror of https://github.com/xemu-project/xemu.git
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>
This commit is contained in:
parent
d455ebc4f8
commit
4366e1db16
|
@ -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) {
|
||||
|
|
|
@ -310,7 +310,8 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size)
|
|||
as = cpu_get_address_space(cs, asidx);
|
||||
|
||||
if (kernel_filename) {
|
||||
image_size = load_elf_as(kernel_filename, NULL, NULL, &entry, &lowaddr,
|
||||
image_size = load_elf_as(kernel_filename, NULL, NULL, NULL,
|
||||
&entry, &lowaddr,
|
||||
NULL, big_endian, EM_ARM, 1, 0, as);
|
||||
if (image_size < 0) {
|
||||
image_size = load_image_targphys_as(kernel_filename, 0,
|
||||
|
|
|
@ -881,7 +881,7 @@ static int64_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry,
|
|||
}
|
||||
}
|
||||
|
||||
ret = load_elf_as(info->kernel_filename, NULL, NULL,
|
||||
ret = load_elf_as(info->kernel_filename, NULL, NULL, NULL,
|
||||
pentry, lowaddr, highaddr, big_endian, elf_machine,
|
||||
1, data_swab, as);
|
||||
if (ret <= 0) {
|
||||
|
|
|
@ -136,7 +136,7 @@ static void generic_loader_realize(DeviceState *dev, Error **errp)
|
|||
AddressSpace *as = s->cpu ? s->cpu->as : NULL;
|
||||
|
||||
if (!s->force_raw) {
|
||||
size = load_elf_as(s->file, NULL, NULL, &entry, NULL, NULL,
|
||||
size = load_elf_as(s->file, NULL, NULL, NULL, &entry, NULL, NULL,
|
||||
big_endian, 0, 0, 0, as);
|
||||
|
||||
if (size < 0) {
|
||||
|
|
|
@ -396,37 +396,42 @@ fail:
|
|||
}
|
||||
|
||||
/* return < 0 if error, otherwise the number of bytes loaded in memory */
|
||||
int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
|
||||
int load_elf(const char *filename,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||
int clear_lsb, int data_swab)
|
||||
{
|
||||
return load_elf_as(filename, translate_fn, translate_opaque, pentry,
|
||||
lowaddr, highaddr, big_endian, elf_machine, clear_lsb,
|
||||
data_swab, NULL);
|
||||
return load_elf_as(filename, elf_note_fn, translate_fn, translate_opaque,
|
||||
pentry, lowaddr, highaddr, big_endian, elf_machine,
|
||||
clear_lsb, data_swab, NULL);
|
||||
}
|
||||
|
||||
/* return < 0 if error, otherwise the number of bytes loaded in memory */
|
||||
int load_elf_as(const char *filename,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||
int clear_lsb, int data_swab, AddressSpace *as)
|
||||
{
|
||||
return load_elf_ram(filename, translate_fn, translate_opaque,
|
||||
return load_elf_ram(filename, elf_note_fn, translate_fn, translate_opaque,
|
||||
pentry, lowaddr, highaddr, big_endian, elf_machine,
|
||||
clear_lsb, data_swab, as, true);
|
||||
}
|
||||
|
||||
/* return < 0 if error, otherwise the number of bytes loaded in memory */
|
||||
int load_elf_ram(const char *filename,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||
int clear_lsb, int data_swab, AddressSpace *as,
|
||||
bool load_rom)
|
||||
{
|
||||
return load_elf_ram_sym(filename, translate_fn, translate_opaque,
|
||||
return load_elf_ram_sym(filename, elf_note_fn,
|
||||
translate_fn, translate_opaque,
|
||||
pentry, lowaddr, highaddr, big_endian,
|
||||
elf_machine, clear_lsb, data_swab, as,
|
||||
load_rom, NULL);
|
||||
|
@ -434,6 +439,7 @@ int load_elf_ram(const char *filename,
|
|||
|
||||
/* return < 0 if error, otherwise the number of bytes loaded in memory */
|
||||
int load_elf_ram_sym(const char *filename,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque, uint64_t *pentry,
|
||||
uint64_t *lowaddr, uint64_t *highaddr, int big_endian,
|
||||
|
@ -476,11 +482,13 @@ int load_elf_ram_sym(const char *filename,
|
|||
|
||||
lseek(fd, 0, SEEK_SET);
|
||||
if (e_ident[EI_CLASS] == ELFCLASS64) {
|
||||
ret = load_elf64(filename, fd, translate_fn, translate_opaque, must_swab,
|
||||
ret = load_elf64(filename, fd, elf_note_fn,
|
||||
translate_fn, translate_opaque, must_swab,
|
||||
pentry, lowaddr, highaddr, elf_machine, clear_lsb,
|
||||
data_swab, as, load_rom, sym_cb);
|
||||
} else {
|
||||
ret = load_elf32(filename, fd, translate_fn, translate_opaque, must_swab,
|
||||
ret = load_elf32(filename, fd, elf_note_fn,
|
||||
translate_fn, translate_opaque, must_swab,
|
||||
pentry, lowaddr, highaddr, elf_machine, clear_lsb,
|
||||
data_swab, as, load_rom, sym_cb);
|
||||
}
|
||||
|
|
|
@ -75,7 +75,8 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
|
|||
env->load_info = li;
|
||||
/* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis
|
||||
devboard SDK. */
|
||||
image_size = load_elf(li->image_filename, translate_kernel_address, NULL,
|
||||
image_size = load_elf(li->image_filename, NULL,
|
||||
translate_kernel_address, NULL,
|
||||
&entry, NULL, &high, 0, EM_CRIS, 0, 0);
|
||||
li->entry = entry;
|
||||
if (image_size < 0) {
|
||||
|
|
|
@ -135,8 +135,8 @@ static void machine_hppa_init(MachineState *machine)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
size = load_elf(firmware_filename, NULL,
|
||||
NULL, &firmware_entry, &firmware_low, &firmware_high,
|
||||
size = load_elf(firmware_filename, NULL, NULL, NULL,
|
||||
&firmware_entry, &firmware_low, &firmware_high,
|
||||
true, EM_PARISC, 0, 0);
|
||||
|
||||
/* Unfortunately, load_elf sign-extends reading elf32. */
|
||||
|
@ -165,7 +165,7 @@ static void machine_hppa_init(MachineState *machine)
|
|||
|
||||
/* Load kernel */
|
||||
if (kernel_filename) {
|
||||
size = load_elf(kernel_filename, &cpu_hppa_to_phys,
|
||||
size = load_elf(kernel_filename, NULL, &cpu_hppa_to_phys,
|
||||
NULL, &kernel_entry, &kernel_low, &kernel_high,
|
||||
true, EM_PARISC, 0, 0);
|
||||
|
||||
|
|
|
@ -199,7 +199,7 @@ int load_multiboot(FWCfgState *fw_cfg,
|
|||
exit(1);
|
||||
}
|
||||
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
|
||||
&elf_low, &elf_high, 0, I386_ELF_MACHINE,
|
||||
0, 0);
|
||||
if (kernel_size < 0) {
|
||||
|
|
|
@ -138,7 +138,8 @@ static void lm32_evr_init(MachineState *machine)
|
|||
uint64_t entry;
|
||||
int kernel_size;
|
||||
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&entry, NULL, NULL,
|
||||
1, EM_LATTICEMICO32, 0, 0);
|
||||
reset_info->bootstrap_pc = entry;
|
||||
|
||||
|
@ -231,7 +232,8 @@ static void lm32_uclinux_init(MachineState *machine)
|
|||
uint64_t entry;
|
||||
int kernel_size;
|
||||
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&entry, NULL, NULL,
|
||||
1, EM_LATTICEMICO32, 0, 0);
|
||||
reset_info->bootstrap_pc = entry;
|
||||
|
||||
|
|
|
@ -176,7 +176,8 @@ milkymist_init(MachineState *machine)
|
|||
uint64_t entry;
|
||||
|
||||
/* Boots a kernel elf binary. */
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&entry, NULL, NULL,
|
||||
1, EM_LATTICEMICO32, 0, 0);
|
||||
reset_info->bootstrap_pc = entry;
|
||||
|
||||
|
|
|
@ -66,7 +66,7 @@ static void an5206_init(MachineState *machine)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
|
||||
NULL, NULL, 1, EM_68K, 0, 0);
|
||||
entry = elf_entry;
|
||||
if (kernel_size < 0) {
|
||||
|
|
|
@ -294,7 +294,7 @@ static void mcf5208evb_init(MachineState *machine)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
|
||||
NULL, NULL, 1, EM_68K, 0, 0);
|
||||
entry = elf_entry;
|
||||
if (kernel_size < 0) {
|
||||
|
|
|
@ -142,13 +142,14 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
|
|||
#endif
|
||||
|
||||
/* Boots a kernel elf binary. */
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&entry, &low, &high,
|
||||
big_endian, EM_MICROBLAZE, 0, 0);
|
||||
base32 = entry;
|
||||
if (base32 == 0xc0000000) {
|
||||
kernel_size = load_elf(kernel_filename, translate_kernel_address,
|
||||
NULL, &entry, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL,
|
||||
translate_kernel_address, NULL,
|
||||
&entry, NULL, NULL,
|
||||
big_endian, EM_MICROBLAZE, 0, 0);
|
||||
}
|
||||
/* Always boot into physical ram. */
|
||||
|
|
|
@ -111,8 +111,9 @@ static int64_t load_kernel (CPUMIPSState *env)
|
|||
uint32_t *prom_buf;
|
||||
long prom_size;
|
||||
|
||||
kernel_size = load_elf(loaderparams.kernel_filename, cpu_mips_kseg0_to_phys,
|
||||
NULL, (uint64_t *)&kernel_entry,
|
||||
kernel_size = load_elf(loaderparams.kernel_filename, NULL,
|
||||
cpu_mips_kseg0_to_phys, NULL,
|
||||
(uint64_t *)&kernel_entry,
|
||||
(uint64_t *)&kernel_low, (uint64_t *)&kernel_high,
|
||||
0, EM_MIPS, 1, 0);
|
||||
if (kernel_size < 0) {
|
||||
|
|
|
@ -1010,8 +1010,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 *)&kernel_entry, NULL,
|
||||
kernel_size = load_elf(loaderparams.kernel_filename, NULL,
|
||||
cpu_mips_kseg0_to_phys, NULL,
|
||||
(uint64_t *)&kernel_entry, NULL,
|
||||
(uint64_t *)&kernel_high, big_endian, EM_MIPS, 1, 0);
|
||||
if (kernel_size < 0) {
|
||||
error_report("could not load kernel '%s': %s",
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -92,8 +92,9 @@ static int64_t load_kernel(void)
|
|||
#else
|
||||
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) {
|
||||
|
|
|
@ -57,7 +57,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams *loader_params)
|
|||
long kernel_size;
|
||||
ram_addr_t initrd_offset;
|
||||
|
||||
kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL,
|
||||
kernel_size = load_elf(loader_params->kernel_filename, NULL, NULL, NULL,
|
||||
&entry, &kernel_low, &kernel_high, 1, EM_MOXIE,
|
||||
0, 0);
|
||||
|
||||
|
|
|
@ -146,13 +146,14 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,
|
|||
#endif
|
||||
|
||||
/* Boots a kernel elf binary. */
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&entry, &low, &high,
|
||||
big_endian, EM_ALTERA_NIOS2, 0, 0);
|
||||
base32 = entry;
|
||||
if (base32 == 0xc0000000) {
|
||||
kernel_size = load_elf(kernel_filename, translate_kernel_address,
|
||||
NULL, &entry, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL,
|
||||
translate_kernel_address, NULL,
|
||||
&entry, NULL, NULL,
|
||||
big_endian, EM_ALTERA_NIOS2, 0, 0);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -331,7 +331,7 @@ static void raven_realize(PCIDevice *d, Error **errp)
|
|||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, s->bios_name);
|
||||
if (filename) {
|
||||
if (s->elf_machine != EM_NONE) {
|
||||
bios_size = load_elf(filename, NULL, NULL, NULL,
|
||||
bios_size = load_elf(filename, NULL, NULL, NULL, NULL,
|
||||
NULL, NULL, 1, s->elf_machine, 0, 0);
|
||||
}
|
||||
if (bios_size < 0) {
|
||||
|
|
|
@ -988,7 +988,8 @@ void ppce500_init(MachineState *machine)
|
|||
|
||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, payload_name);
|
||||
|
||||
payload_size = load_elf(filename, NULL, NULL, &bios_entry, &loadaddr, NULL,
|
||||
payload_size = load_elf(filename, NULL, NULL, NULL,
|
||||
&bios_entry, &loadaddr, NULL,
|
||||
1, PPC_ELF_MACHINE, 0, 0);
|
||||
if (payload_size < 0) {
|
||||
/*
|
||||
|
|
|
@ -164,7 +164,7 @@ static void ppc_core99_init(MachineState *machine)
|
|||
|
||||
/* Load OpenBIOS (ELF) */
|
||||
if (filename) {
|
||||
bios_size = load_elf(filename, NULL, NULL, NULL,
|
||||
bios_size = load_elf(filename, NULL, NULL, NULL, NULL,
|
||||
NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
|
||||
|
||||
g_free(filename);
|
||||
|
@ -187,7 +187,8 @@ static void ppc_core99_init(MachineState *machine)
|
|||
#endif
|
||||
kernel_base = KERNEL_LOAD_ADDR;
|
||||
|
||||
kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL,
|
||||
translate_kernel_address, NULL,
|
||||
NULL, &lowaddr, NULL, 1, PPC_ELF_MACHINE,
|
||||
0, 0);
|
||||
if (kernel_size < 0)
|
||||
|
|
|
@ -139,7 +139,7 @@ static void ppc_heathrow_init(MachineState *machine)
|
|||
|
||||
/* Load OpenBIOS (ELF) */
|
||||
if (filename) {
|
||||
bios_size = load_elf(filename, 0, NULL, NULL, NULL, NULL,
|
||||
bios_size = load_elf(filename, NULL, 0, NULL, NULL, NULL, NULL,
|
||||
1, PPC_ELF_MACHINE, 0, 0);
|
||||
g_free(filename);
|
||||
} else {
|
||||
|
@ -160,7 +160,8 @@ static void ppc_heathrow_init(MachineState *machine)
|
|||
bswap_needed = 0;
|
||||
#endif
|
||||
kernel_base = KERNEL_LOAD_ADDR;
|
||||
kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL,
|
||||
translate_kernel_address, NULL,
|
||||
NULL, &lowaddr, NULL, 1, PPC_ELF_MACHINE,
|
||||
0, 0);
|
||||
if (kernel_size < 0)
|
||||
|
|
|
@ -256,7 +256,7 @@ static void bamboo_init(MachineState *machine)
|
|||
success = load_uimage(kernel_filename, &entry, &loadaddr, NULL,
|
||||
NULL, NULL);
|
||||
if (success < 0) {
|
||||
success = load_elf(kernel_filename, NULL, NULL, &elf_entry,
|
||||
success = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
|
||||
&elf_lowaddr, NULL, 1, PPC_ELF_MACHINE,
|
||||
0, 0);
|
||||
entry = elf_entry;
|
||||
|
|
|
@ -426,7 +426,8 @@ static void sam460ex_init(MachineState *machine)
|
|||
if (success < 0) {
|
||||
uint64_t elf_entry, elf_lowaddr;
|
||||
|
||||
success = load_elf(machine->kernel_filename, NULL, NULL, &elf_entry,
|
||||
success = load_elf(machine->kernel_filename, NULL,
|
||||
NULL, NULL, &elf_entry,
|
||||
&elf_lowaddr, NULL, 1, PPC_ELF_MACHINE, 0, 0);
|
||||
entry = elf_entry;
|
||||
loadaddr = elf_lowaddr;
|
||||
|
|
|
@ -2851,11 +2851,12 @@ static void spapr_machine_init(MachineState *machine)
|
|||
if (kernel_filename) {
|
||||
uint64_t lowaddr = 0;
|
||||
|
||||
spapr->kernel_size = load_elf(kernel_filename, translate_kernel_address,
|
||||
NULL, NULL, &lowaddr, NULL, 1,
|
||||
spapr->kernel_size = load_elf(kernel_filename, NULL,
|
||||
translate_kernel_address, NULL,
|
||||
NULL, &lowaddr, NULL, 1,
|
||||
PPC_ELF_MACHINE, 0, 0);
|
||||
if (spapr->kernel_size == ELF_LOAD_WRONG_ENDIAN) {
|
||||
spapr->kernel_size = load_elf(kernel_filename,
|
||||
spapr->kernel_size = load_elf(kernel_filename, NULL,
|
||||
translate_kernel_address, NULL, NULL,
|
||||
&lowaddr, NULL, 0, PPC_ELF_MACHINE,
|
||||
0, 0);
|
||||
|
|
|
@ -258,7 +258,7 @@ static void virtex_init(MachineState *machine)
|
|||
hwaddr boot_offset;
|
||||
|
||||
/* Boots a kernel elf binary. */
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&entry, &low, &high, 1, PPC_ELF_MACHINE,
|
||||
0, 0);
|
||||
boot_info.bootstrap_pc = entry & 0x00ffffff;
|
||||
|
|
|
@ -78,7 +78,7 @@ static uint64_t load_kernel(const char *kernel_filename)
|
|||
{
|
||||
uint64_t kernel_entry, kernel_high;
|
||||
|
||||
if (load_elf(kernel_filename, NULL, NULL,
|
||||
if (load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&kernel_entry, NULL, &kernel_high,
|
||||
0, EM_RISCV, 1, 0) < 0) {
|
||||
error_report("could not load kernel '%s'", kernel_filename);
|
||||
|
|
|
@ -69,7 +69,7 @@ static uint64_t load_kernel(const char *kernel_filename)
|
|||
{
|
||||
uint64_t kernel_entry, kernel_high;
|
||||
|
||||
if (load_elf(kernel_filename, NULL, NULL,
|
||||
if (load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&kernel_entry, NULL, &kernel_high,
|
||||
0, EM_RISCV, 1, 0) < 0) {
|
||||
error_report("could not load kernel '%s'", kernel_filename);
|
||||
|
|
|
@ -57,7 +57,7 @@ static uint64_t load_kernel(const char *kernel_filename)
|
|||
{
|
||||
uint64_t kernel_entry, kernel_high;
|
||||
|
||||
if (load_elf_ram_sym(kernel_filename, NULL, NULL,
|
||||
if (load_elf_ram_sym(kernel_filename, NULL, NULL, NULL,
|
||||
&kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0,
|
||||
NULL, true, htif_symbol_callback) < 0) {
|
||||
error_report("could not load kernel '%s'", kernel_filename);
|
||||
|
|
|
@ -66,7 +66,7 @@ static uint64_t load_kernel(const char *kernel_filename)
|
|||
{
|
||||
uint64_t kernel_entry, kernel_high;
|
||||
|
||||
if (load_elf(kernel_filename, NULL, NULL,
|
||||
if (load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&kernel_entry, NULL, &kernel_high,
|
||||
0, EM_RISCV, 1, 0) < 0) {
|
||||
error_report("could not load kernel '%s'", kernel_filename);
|
||||
|
|
|
@ -131,7 +131,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
|
|||
goto error;
|
||||
}
|
||||
|
||||
bios_size = load_elf(bios_filename, bios_translate_addr, &fwbase,
|
||||
bios_size = load_elf(bios_filename, NULL,
|
||||
bios_translate_addr, &fwbase,
|
||||
&ipl->bios_start_addr, NULL, NULL, 1,
|
||||
EM_S390, 0, 0);
|
||||
if (bios_size > 0) {
|
||||
|
@ -155,7 +156,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
|
|||
}
|
||||
|
||||
if (ipl->kernel) {
|
||||
kernel_size = load_elf(ipl->kernel, NULL, NULL, &pentry, NULL,
|
||||
kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL,
|
||||
&pentry, NULL,
|
||||
NULL, 1, EM_S390, 0, 0);
|
||||
if (kernel_size < 0) {
|
||||
kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);
|
||||
|
@ -436,7 +438,8 @@ static int load_netboot_image(Error **errp)
|
|||
goto unref_mr;
|
||||
}
|
||||
|
||||
img_size = load_elf_ram(netboot_filename, NULL, NULL, &ipl->start_addr,
|
||||
img_size = load_elf_ram(netboot_filename, NULL, NULL, NULL,
|
||||
&ipl->start_addr,
|
||||
NULL, NULL, 1, EM_S390, 0, 0, NULL, false);
|
||||
|
||||
if (img_size < 0) {
|
||||
|
|
|
@ -190,7 +190,8 @@ static void leon3_generic_hw_init(MachineState *machine)
|
|||
long kernel_size;
|
||||
uint64_t entry;
|
||||
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, &entry, NULL, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
||||
&entry, NULL, NULL,
|
||||
1 /* big endian */, EM_SPARC, 0, 0);
|
||||
if (kernel_size < 0) {
|
||||
error_report("could not load kernel '%s'", kernel_filename);
|
||||
|
|
|
@ -242,7 +242,8 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename,
|
|||
#else
|
||||
bswap_needed = 0;
|
||||
#endif
|
||||
kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL,
|
||||
kernel_size = load_elf(kernel_filename, NULL,
|
||||
translate_kernel_address, NULL,
|
||||
NULL, NULL, NULL, 1, EM_SPARC, 0, 0);
|
||||
if (kernel_size < 0)
|
||||
kernel_size = load_aout(kernel_filename, KERNEL_LOAD_ADDR,
|
||||
|
@ -692,7 +693,8 @@ static void prom_init(hwaddr addr, const char *bios_name)
|
|||
}
|
||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
||||
if (filename) {
|
||||
ret = load_elf(filename, translate_prom_address, &addr, NULL,
|
||||
ret = load_elf(filename, NULL,
|
||||
translate_prom_address, &addr, NULL,
|
||||
NULL, NULL, 1, EM_SPARC, 0, 0);
|
||||
if (ret < 0 || ret > PROM_SIZE_MAX) {
|
||||
ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);
|
||||
|
|
|
@ -153,7 +153,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename,
|
|||
#else
|
||||
bswap_needed = 0;
|
||||
#endif
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, kernel_entry,
|
||||
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_entry,
|
||||
kernel_addr, &kernel_top, 1, EM_SPARCV9, 0, 0);
|
||||
if (kernel_size < 0) {
|
||||
*kernel_addr = KERNEL_LOAD_ADDR;
|
||||
|
@ -411,7 +411,7 @@ static void prom_init(hwaddr addr, const char *bios_name)
|
|||
}
|
||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
||||
if (filename) {
|
||||
ret = load_elf(filename, translate_prom_address, &addr,
|
||||
ret = load_elf(filename, NULL, translate_prom_address, &addr,
|
||||
NULL, NULL, NULL, 1, EM_SPARCV9, 0, 0);
|
||||
if (ret < 0 || ret > PROM_SIZE_MAX) {
|
||||
ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);
|
||||
|
|
|
@ -45,7 +45,7 @@ static void tricore_load_kernel(CPUTriCoreState *env)
|
|||
long kernel_size;
|
||||
|
||||
kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL,
|
||||
NULL, &entry, NULL,
|
||||
NULL, NULL, &entry, NULL,
|
||||
NULL, 0,
|
||||
EM_TRICORE, 1, 0);
|
||||
if (kernel_size <= 0) {
|
||||
|
|
|
@ -97,11 +97,15 @@ static void xtensa_sim_init(MachineState *machine)
|
|||
uint64_t elf_entry;
|
||||
uint64_t elf_lowaddr;
|
||||
#ifdef TARGET_WORDS_BIGENDIAN
|
||||
int success = load_elf(kernel_filename, translate_phys_addr, cpu,
|
||||
&elf_entry, &elf_lowaddr, NULL, 1, EM_XTENSA, 0, 0);
|
||||
int success = load_elf(kernel_filename, NULL,
|
||||
translate_phys_addr, cpu,
|
||||
&elf_entry, &elf_lowaddr,
|
||||
NULL, 1, EM_XTENSA, 0, 0);
|
||||
#else
|
||||
int success = load_elf(kernel_filename, translate_phys_addr, cpu,
|
||||
&elf_entry, &elf_lowaddr, NULL, 0, EM_XTENSA, 0, 0);
|
||||
int success = load_elf(kernel_filename, NULL,
|
||||
translate_phys_addr, cpu,
|
||||
&elf_entry, &elf_lowaddr,
|
||||
NULL, 0, EM_XTENSA, 0, 0);
|
||||
#endif
|
||||
if (success > 0) {
|
||||
env->pc = elf_entry;
|
||||
|
|
|
@ -409,7 +409,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
|
|||
|
||||
uint64_t elf_entry;
|
||||
uint64_t elf_lowaddr;
|
||||
int success = load_elf(kernel_filename, translate_phys_addr, cpu,
|
||||
int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu,
|
||||
&elf_entry, &elf_lowaddr, NULL, be, EM_XTENSA, 0, 0);
|
||||
if (success > 0) {
|
||||
entry_point = elf_entry;
|
||||
|
|
|
@ -266,6 +266,7 @@ fail:
|
|||
}
|
||||
|
||||
static int glue(load_elf, SZ)(const char *name, int fd,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque,
|
||||
int must_swab, uint64_t *pentry,
|
||||
|
@ -498,6 +499,7 @@ static int glue(load_elf, SZ)(const char *name, int fd,
|
|||
data = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
g_free(phdr);
|
||||
if (lowaddr)
|
||||
*lowaddr = (uint64_t)(elf_sword)low;
|
||||
|
|
|
@ -93,6 +93,8 @@ const char *load_elf_strerror(int error);
|
|||
|
||||
/** load_elf_ram_sym:
|
||||
* @filename: Path of ELF file
|
||||
* @elf_note_fn: optional function to parse ELF Note type
|
||||
* passed via @translate_opaque
|
||||
* @translate_fn: optional function to translate load addresses
|
||||
* @translate_opaque: opaque data passed to @translate_fn
|
||||
* @pentry: Populated with program entry point. Ignored if NULL.
|
||||
|
@ -125,6 +127,7 @@ typedef void (*symbol_fn_t)(const char *st_name, int st_info,
|
|||
uint64_t st_value, uint64_t st_size);
|
||||
|
||||
int load_elf_ram_sym(const char *filename,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque, uint64_t *pentry,
|
||||
uint64_t *lowaddr, uint64_t *highaddr, int big_endian,
|
||||
|
@ -136,6 +139,7 @@ int load_elf_ram_sym(const char *filename,
|
|||
* symbol callback function
|
||||
*/
|
||||
int load_elf_ram(const char *filename,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||
|
@ -146,6 +150,7 @@ int load_elf_ram(const char *filename,
|
|||
* Same as load_elf_ram(), but always loads the elf as ROM
|
||||
*/
|
||||
int load_elf_as(const char *filename,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||
|
@ -155,7 +160,9 @@ int load_elf_as(const char *filename,
|
|||
* Same as load_elf_as(), but doesn't allow the caller to specify an
|
||||
* AddressSpace.
|
||||
*/
|
||||
int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
|
||||
int load_elf(const char *filename,
|
||||
uint64_t (*elf_note_fn)(void *, void *, bool),
|
||||
uint64_t (*translate_fn)(void *, uint64_t),
|
||||
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||
int clear_lsb, int data_swab);
|
||||
|
|
Loading…
Reference in New Issue