SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/loader: Pass ELFDATA endian order argument to load_elf()

Browse Source 
Rather than passing a boolean 'is_big_endian' argument,
directly pass the ELFDATA, which can be unspecified using
the ELFDATANONE value.

Update the call sites:
  0                 -> ELFDATA2LSB
  1                 -> ELFDATA2MSB
  TARGET_BIG_ENDIAN -> TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250127113824.50177-7-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-26 18:01:41 +01:00
parent 90f5c86acb
commit adc1a4a26a
36 changed files with 67 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/alpha/dp264.c
View File

@ -144,7 +144,7 @@ static void clipper_init(MachineState *machine)
} }
size = load_elf(palcode_filename, NULL, cpu_alpha_superpage_to_phys, size = load_elf(palcode_filename, NULL, cpu_alpha_superpage_to_phys,
NULL, &palcode_entry, NULL, NULL, NULL, NULL, &palcode_entry, NULL, NULL, NULL,
0, EM_ALPHA, 0, 0); ELFDATA2LSB, EM_ALPHA, 0, 0);
if (size < 0) { if (size < 0) {
error_report("could not load palcode '%s'", palcode_filename); error_report("could not load palcode '%s'", palcode_filename);
exit(1); exit(1);
@ -163,7 +163,7 @@ static void clipper_init(MachineState *machine)
size = load_elf(kernel_filename, NULL, cpu_alpha_superpage_to_phys, size = load_elf(kernel_filename, NULL, cpu_alpha_superpage_to_phys,
NULL, &kernel_entry, &kernel_low, NULL, NULL, NULL, &kernel_entry, &kernel_low, NULL, NULL,
0, EM_ALPHA, 0, 0); ELFDATA2LSB, EM_ALPHA, 0, 0);
if (size < 0) { if (size < 0) {
error_report("could not load kernel '%s'", kernel_filename); error_report("could not load kernel '%s'", kernel_filename);
exit(1); exit(1);

5
hw/core/loader.c
View File

@ -409,12 +409,11 @@ ssize_t load_elf(const char *filename,
uint64_t (*elf_note_fn)(void *, void *, bool), uint64_t (*elf_note_fn)(void *, void *, bool),
uint64_t (*translate_fn)(void *, uint64_t), uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr, void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
uint64_t *highaddr, uint32_t *pflags, int big_endian, uint64_t *highaddr, uint32_t *pflags, int elf_data_order,
int elf_machine, int clear_lsb, int data_swab) int elf_machine, int clear_lsb, int data_swab)
{ {
return load_elf_as(filename, elf_note_fn, translate_fn, translate_opaque, return load_elf_as(filename, elf_note_fn, translate_fn, translate_opaque,
pentry, lowaddr, highaddr, pflags, pentry, lowaddr, highaddr, pflags, elf_data_order,
big_endian ? ELFDATA2MSB : ELFDATA2LSB,
elf_machine, clear_lsb, data_swab, NULL); elf_machine, clear_lsb, data_swab, NULL);
} }

4
hw/hppa/machine.c
View File

@ -440,7 +440,7 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
size = load_elf(firmware_filename, NULL, translate, NULL, size = load_elf(firmware_filename, NULL, translate, NULL,
&firmware_entry, &firmware_low, &firmware_high, NULL, &firmware_entry, &firmware_low, &firmware_high, NULL,
true, EM_PARISC, 0, 0); ELFDATA2MSB, EM_PARISC, 0, 0);
if (size < 0) { if (size < 0) {
error_report("could not load firmware '%s'", firmware_filename); error_report("could not load firmware '%s'", firmware_filename);
@ -467,7 +467,7 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus,
if (kernel_filename) { if (kernel_filename) {
size = load_elf(kernel_filename, NULL, linux_kernel_virt_to_phys, size = load_elf(kernel_filename, NULL, linux_kernel_virt_to_phys,
NULL, &kernel_entry, &kernel_low, &kernel_high, NULL, NULL, &kernel_entry, &kernel_low, &kernel_high, NULL,
true, EM_PARISC, 0, 0); ELFDATA2MSB, EM_PARISC, 0, 0);
kernel_entry = linux_kernel_virt_to_phys(NULL, kernel_entry); kernel_entry = linux_kernel_virt_to_phys(NULL, kernel_entry);

4
hw/i386/multiboot.c
View File

@ -202,8 +202,8 @@ int load_multiboot(X86MachineState *x86ms,
} }
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
&elf_low, &elf_high, NULL, 0, I386_ELF_MACHINE, &elf_low, &elf_high, NULL,
0, 0); ELFDATA2LSB, I386_ELF_MACHINE, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("Error while loading elf kernel"); error_report("Error while loading elf kernel");
exit(1); exit(1);

4
hw/i386/x86-common.c
View File

@ -608,8 +608,8 @@ static bool load_elfboot(const char *kernel_filename,
uint64_t elf_note_type = XEN_ELFNOTE_PHYS32_ENTRY; uint64_t elf_note_type = XEN_ELFNOTE_PHYS32_ENTRY;
kernel_size = load_elf(kernel_filename, read_pvh_start_addr, kernel_size = load_elf(kernel_filename, read_pvh_start_addr,
NULL, &elf_note_type, &elf_entry, NULL, &elf_note_type, &elf_entry,
&elf_low, &elf_high, NULL, 0, I386_ELF_MACHINE, &elf_low, &elf_high, NULL,
0, 0); ELFDATA2LSB, I386_ELF_MACHINE, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("Error while loading elf kernel"); error_report("Error while loading elf kernel");

2
hw/loongarch/boot.c
View File

@ -243,7 +243,7 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
kernel_size = load_elf(info->kernel_filename, NULL, kernel_size = load_elf(info->kernel_filename, NULL,
cpu_loongarch_virt_to_phys, NULL, cpu_loongarch_virt_to_phys, NULL,
&kernel_entry, &kernel_low, &kernel_entry, &kernel_low,
&kernel_high, NULL, 0, &kernel_high, NULL, ELFDATA2LSB,
EM_LOONGARCH, 1, 0); EM_LOONGARCH, 1, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_loongarch_linux_image(info->kernel_filename, kernel_size = load_loongarch_linux_image(info->kernel_filename,

2
hw/m68k/an5206.c
View File

@ -74,7 +74,7 @@ static void an5206_init(MachineState *machine)
} }
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
NULL, NULL, NULL, 1, EM_68K, 0, 0); NULL, NULL, NULL, ELFDATA2MSB, EM_68K, 0, 0);
entry = elf_entry; entry = elf_entry;
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL, kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL,

2
hw/m68k/mcf5208.c
View File

@ -372,7 +372,7 @@ static void mcf5208evb_init(MachineState *machine)
} }
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
NULL, NULL, NULL, 1, EM_68K, 0, 0); NULL, NULL, NULL, ELFDATA2MSB, EM_68K, 0, 0);
entry = elf_entry; entry = elf_entry;
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL, kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL,

2
hw/m68k/q800.c
View File

@ -585,7 +585,7 @@ static void q800_machine_init(MachineState *machine)
} }
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&elf_entry, NULL, &high, NULL, 1, &elf_entry, NULL, &high, NULL, ELFDATA2MSB,
EM_68K, 0, 0); EM_68K, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s'", kernel_filename); error_report("could not load kernel '%s'", kernel_filename);

2
hw/m68k/virt.c
View File

@ -228,7 +228,7 @@ static void virt_init(MachineState *machine)
} }
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&elf_entry, NULL, &high, NULL, 1, &elf_entry, NULL, &high, NULL, ELFDATA2MSB,
EM_68K, 0, 0); EM_68K, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s'", kernel_filename); error_report("could not load kernel '%s'", kernel_filename);

6
hw/microblaze/boot.c
View File

@ -144,13 +144,15 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is_little_endian,
/* Boots a kernel elf binary. */ /* Boots a kernel elf binary. */
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&entry, NULL, &high, NULL, &entry, NULL, &high, NULL,
!is_little_endian, EM_MICROBLAZE, 0, 0); is_little_endian ? ELFDATA2LSB : ELFDATA2MSB,
EM_MICROBLAZE, 0, 0);
base32 = entry; base32 = entry;
if (base32 == 0xc0000000) { if (base32 == 0xc0000000) {
kernel_size = load_elf(kernel_filename, NULL, kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, NULL, translate_kernel_address, NULL,
&entry, NULL, NULL, NULL, &entry, NULL, NULL, NULL,
!is_little_endian, EM_MICROBLAZE, 0, 0); is_little_endian ? ELFDATA2LSB : ELFDATA2MSB,
EM_MICROBLAZE, 0, 0);
} }
/* Always boot into physical ram. */ /* Always boot into physical ram. */
boot_info.bootstrap_pc = (uint32_t)entry; boot_info.bootstrap_pc = (uint32_t)entry;

2
hw/mips/boston.c
View File

@ -792,7 +792,7 @@ static void boston_mach_init(MachineState *machine)
kernel_size = load_elf(machine->kernel_filename, NULL, kernel_size = load_elf(machine->kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL, cpu_mips_kseg0_to_phys, NULL,
&kernel_entry, NULL, &kernel_high, &kernel_entry, NULL, &kernel_high,
NULL, 0, EM_MIPS, 1, 0); NULL, ELFDATA2LSB, EM_MIPS, 1, 0);
if (kernel_size > 0) { if (kernel_size > 0) {
int dt_size; int dt_size;

2
hw/mips/fuloong2e.c
View File

@ -106,7 +106,7 @@ static uint64_t load_kernel(MIPSCPU *cpu)
cpu_mips_kseg0_to_phys, NULL, cpu_mips_kseg0_to_phys, NULL,
&kernel_entry, NULL, &kernel_entry, NULL,
&kernel_high, NULL, &kernel_high, NULL,
0, EM_MIPS, 1, 0); ELFDATA2LSB, EM_MIPS, 1, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s': %s", error_report("could not load kernel '%s': %s",
loaderparams.kernel_filename, loaderparams.kernel_filename,

2
hw/mips/loongson3_virt.c
View File

@ -358,7 +358,7 @@ static uint64_t load_kernel(CPUMIPSState *env)
cpu_mips_kseg0_to_phys, NULL, cpu_mips_kseg0_to_phys, NULL,
&kernel_entry, &kernel_entry,
&kernel_low, &kernel_high, &kernel_low, &kernel_high,
NULL, 0, EM_MIPS, 1, 0); NULL, ELFDATA2LSB, EM_MIPS, 1, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s': %s", error_report("could not load kernel '%s': %s",
loaderparams.kernel_filename, loaderparams.kernel_filename,

5
hw/mips/malta.c
View File

@ -880,8 +880,9 @@ static uint64_t load_kernel(void)
kernel_size = load_elf(loaderparams.kernel_filename, NULL, kernel_size = load_elf(loaderparams.kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL, cpu_mips_kseg0_to_phys, NULL,
&kernel_entry, NULL, &kernel_entry, NULL,
&kernel_high, NULL, TARGET_BIG_ENDIAN, EM_MIPS, &kernel_high, NULL,
1, 0); TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB,
EM_MIPS, 1, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s': %s", error_report("could not load kernel '%s': %s",
loaderparams.kernel_filename, loaderparams.kernel_filename,

3
hw/mips/mipssim.c
View File

@ -73,7 +73,8 @@ static uint64_t load_kernel(void)
kernel_size = load_elf(loaderparams.kernel_filename, NULL, kernel_size = load_elf(loaderparams.kernel_filename, NULL,
cpu_mips_kseg0_to_phys, NULL, cpu_mips_kseg0_to_phys, NULL,
&entry, NULL, &entry, NULL,
&kernel_high, NULL, TARGET_BIG_ENDIAN, &kernel_high, NULL,
TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB,
EM_MIPS, 1, 0); EM_MIPS, 1, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("could not load kernel '%s': %s", error_report("could not load kernel '%s': %s",

2
hw/openrisc/boot.c
View File

@ -32,7 +32,7 @@ hwaddr openrisc_load_kernel(ram_addr_t ram_size,
if (kernel_filename && !qtest_enabled()) { if (kernel_filename && !qtest_enabled()) {
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&elf_entry, NULL, &high_addr, NULL, 1, &elf_entry, NULL, &high_addr, NULL, ELFDATA2MSB,
EM_OPENRISC, 1, 0); EM_OPENRISC, 1, 0);
entry = elf_entry; entry = elf_entry;
if (kernel_size < 0) { if (kernel_size < 0) {

4
hw/pci-host/raven.c
View File

@ -357,8 +357,8 @@ static void raven_realize(PCIDevice *d, Error **errp)
if (filename) { if (filename) {
if (s->elf_machine != EM_NONE) { if (s->elf_machine != EM_NONE) {
bios_size = load_elf(filename, NULL, NULL, NULL, NULL, bios_size = load_elf(filename, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, 1, s->elf_machine, NULL, NULL, NULL,
0, 0); ELFDATA2MSB, s->elf_machine, 0, 0);
} }
if (bios_size < 0) { if (bios_size < 0) {
bios_size = get_image_size(filename); bios_size = get_image_size(filename);

2
hw/ppc/e500.c
View File

@ -1194,7 +1194,7 @@ void ppce500_init(MachineState *machine)
payload_size = load_elf(filename, NULL, NULL, NULL, payload_size = load_elf(filename, NULL, NULL, NULL,
&bios_entry, &loadaddr, NULL, NULL, &bios_entry, &loadaddr, NULL, NULL,
1, PPC_ELF_MACHINE, 0, 0); ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (payload_size < 0) { if (payload_size < 0) {
/* /*
* Hrm. No ELF image? Try a uImage, maybe someone is giving us an * Hrm. No ELF image? Try a uImage, maybe someone is giving us an

5
hw/ppc/mac_newworld.c
View File

@ -182,7 +182,8 @@ static void ppc_core99_init(MachineState *machine)
if (filename) { if (filename) {
/* Load OpenBIOS (ELF) */ /* Load OpenBIOS (ELF) */
bios_size = load_elf(filename, NULL, NULL, NULL, NULL, bios_size = load_elf(filename, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0); NULL, NULL, NULL,
ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (bios_size <= 0) { if (bios_size <= 0) {
/* or load binary ROM image */ /* or load binary ROM image */
@ -204,7 +205,7 @@ static void ppc_core99_init(MachineState *machine)
kernel_base = KERNEL_LOAD_ADDR; kernel_base = KERNEL_LOAD_ADDR;
kernel_size = load_elf(machine->kernel_filename, NULL, kernel_size = load_elf(machine->kernel_filename, NULL,
translate_kernel_address, NULL, NULL, NULL, translate_kernel_address, NULL, NULL, NULL,
NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0); NULL, NULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_aout(machine->kernel_filename, kernel_base, kernel_size = load_aout(machine->kernel_filename, kernel_base,
machine->ram_size - kernel_base, machine->ram_size - kernel_base,

4
hw/ppc/mac_oldworld.c
View File

@ -136,7 +136,7 @@ static void ppc_heathrow_init(MachineState *machine)
if (filename) { if (filename) {
/* Load OpenBIOS (ELF) */ /* Load OpenBIOS (ELF) */
bios_size = load_elf(filename, NULL, NULL, NULL, NULL, &bios_addr, bios_size = load_elf(filename, NULL, NULL, NULL, NULL, &bios_addr,
NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0); NULL, NULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
/* Unfortunately, load_elf sign-extends reading elf32 */ /* Unfortunately, load_elf sign-extends reading elf32 */
bios_addr = (uint32_t)bios_addr; bios_addr = (uint32_t)bios_addr;
@ -161,7 +161,7 @@ static void ppc_heathrow_init(MachineState *machine)
kernel_base = KERNEL_LOAD_ADDR; kernel_base = KERNEL_LOAD_ADDR;
kernel_size = load_elf(machine->kernel_filename, NULL, kernel_size = load_elf(machine->kernel_filename, NULL,
translate_kernel_address, NULL, NULL, NULL, translate_kernel_address, NULL, NULL, NULL,
NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0); NULL, NULL, ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_aout(machine->kernel_filename, kernel_base, kernel_size = load_aout(machine->kernel_filename, kernel_base,
machine->ram_size - kernel_base, machine->ram_size - kernel_base,

8
hw/ppc/pegasos2.c
View File

@ -160,8 +160,8 @@ static void pegasos2_init(MachineState *machine)
} }
memory_region_init_rom(rom, NULL, "pegasos2.rom", PROM_SIZE, &error_fatal); memory_region_init_rom(rom, NULL, "pegasos2.rom", PROM_SIZE, &error_fatal);
memory_region_add_subregion(get_system_memory(), PROM_ADDR, rom); memory_region_add_subregion(get_system_memory(), PROM_ADDR, rom);
sz = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, sz = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
PPC_ELF_MACHINE, 0, 0); ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (sz <= 0) { if (sz <= 0) {
sz = load_image_targphys(filename, pm->vof ? 0 : PROM_ADDR, PROM_SIZE); sz = load_image_targphys(filename, pm->vof ? 0 : PROM_ADDR, PROM_SIZE);
} }
@ -239,8 +239,8 @@ static void pegasos2_init(MachineState *machine)
if (machine->kernel_filename) { if (machine->kernel_filename) {
sz = load_elf(machine->kernel_filename, NULL, NULL, NULL, sz = load_elf(machine->kernel_filename, NULL, NULL, NULL,
&pm->kernel_entry, &pm->kernel_addr, NULL, NULL, 1, &pm->kernel_entry, &pm->kernel_addr, NULL, NULL,
PPC_ELF_MACHINE, 0, 0); ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (sz <= 0) { if (sz <= 0) {
error_report("Could not load kernel '%s'", error_report("Could not load kernel '%s'",
machine->kernel_filename); machine->kernel_filename);

2
hw/ppc/ppc405_boards.c
View File

@ -232,7 +232,7 @@ static void boot_from_kernel(MachineState *machine, PowerPCCPU *cpu)
kernel_size = load_elf(machine->kernel_filename, NULL, NULL, NULL, kernel_size = load_elf(machine->kernel_filename, NULL, NULL, NULL,
&boot_entry, &kernel_base, NULL, NULL, &boot_entry, &kernel_base, NULL, NULL,
1, PPC_ELF_MACHINE, 0, 0); ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
error_report("Could not load kernel '%s' : %s", error_report("Could not load kernel '%s' : %s",
machine->kernel_filename, load_elf_strerror(kernel_size)); machine->kernel_filename, load_elf_strerror(kernel_size));

3
hw/ppc/ppc440_bamboo.c
View File

@ -228,7 +228,8 @@ static void bamboo_init(MachineState *machine)
if (success < 0) { if (success < 0) {
uint64_t elf_entry; uint64_t elf_entry;
success = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry, success = load_elf(kernel_filename, NULL, NULL, NULL, &elf_entry,
NULL, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0); NULL, NULL, NULL,
ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
entry = elf_entry; entry = elf_entry;
} }
/* XXX try again as binary */ /* XXX try again as binary */

2
hw/ppc/sam460ex.c
View File

@ -479,7 +479,7 @@ static void sam460ex_init(MachineState *machine)
success = load_elf(machine->kernel_filename, NULL, NULL, NULL, success = load_elf(machine->kernel_filename, NULL, NULL, NULL,
&elf_entry, NULL, NULL, NULL, &elf_entry, NULL, NULL, NULL,
1, PPC_ELF_MACHINE, 0, 0); ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
entry = elf_entry; entry = elf_entry;
} }
/* XXX try again as binary */ /* XXX try again as binary */

8
hw/ppc/spapr.c
View File

@ -3022,13 +3022,13 @@ static void spapr_machine_init(MachineState *machine)
spapr->kernel_size = load_elf(kernel_filename, NULL, spapr->kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, spapr, translate_kernel_address, spapr,
NULL, &loaded_addr, NULL, NULL, 1, NULL, &loaded_addr, NULL, NULL,
PPC_ELF_MACHINE, 0, 0); ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
if (spapr->kernel_size == ELF_LOAD_WRONG_ENDIAN) { if (spapr->kernel_size == ELF_LOAD_WRONG_ENDIAN) {
spapr->kernel_size = load_elf(kernel_filename, NULL, spapr->kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, spapr, translate_kernel_address, spapr,
NULL, &loaded_addr, NULL, NULL, 0, NULL, &loaded_addr, NULL, NULL,
PPC_ELF_MACHINE, 0, 0); ELFDATA2LSB, PPC_ELF_MACHINE, 0, 0);
spapr->kernel_le = spapr->kernel_size > 0; spapr->kernel_le = spapr->kernel_size > 0;
} }
if (spapr->kernel_size < 0) { if (spapr->kernel_size < 0) {

4
hw/ppc/virtex_ml507.c
View File

@ -242,8 +242,8 @@ static void virtex_init(MachineState *machine)
/* Boots a kernel elf binary. */ /* Boots a kernel elf binary. */
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&entry, NULL, &high, NULL, 1, PPC_ELF_MACHINE, &entry, NULL, &high, NULL,
0, 0); ELFDATA2MSB, PPC_ELF_MACHINE, 0, 0);
boot_info.bootstrap_pc = entry & 0x00ffffff; boot_info.bootstrap_pc = entry & 0x00ffffff;
if (kernel_size < 0) { if (kernel_size < 0) {

6
hw/s390x/ipl.c
View File

@ -162,8 +162,8 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
bios_size = load_elf(bios_filename, NULL, bios_size = load_elf(bios_filename, NULL,
bios_translate_addr, &fwbase, bios_translate_addr, &fwbase,
&ipl->bios_start_addr, NULL, NULL, NULL, 1, &ipl->bios_start_addr, NULL, NULL, NULL,
EM_S390, 0, 0); ELFDATA2MSB, EM_S390, 0, 0);
if (bios_size > 0) { if (bios_size > 0) {
/* Adjust ELF start address to final location */ /* Adjust ELF start address to final location */
ipl->bios_start_addr += fwbase; ipl->bios_start_addr += fwbase;
@ -187,7 +187,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
if (ipl->kernel) { if (ipl->kernel) {
kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL, kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL,
&pentry, NULL, &pentry, NULL,
NULL, NULL, 1, EM_S390, 0, 0); NULL, NULL, ELFDATA2MSB, EM_S390, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_image_targphys(ipl->kernel, 0, ms->ram_size); kernel_size = load_image_targphys(ipl->kernel, 0, ms->ram_size);
if (kernel_size < 0) { if (kernel_size < 0) {

2
hw/sparc/leon3.c
View File

@ -380,7 +380,7 @@ static void leon3_generic_hw_init(MachineState *machine)
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&entry, NULL, NULL, NULL, &entry, NULL, NULL, NULL,
1 /* big endian */, EM_SPARC, 0, 0); ELFDATA2MSB, EM_SPARC, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_uimage(kernel_filename, NULL, &entry, kernel_size = load_uimage(kernel_filename, NULL, &entry,
NULL, NULL, NULL); NULL, NULL, NULL);

5
hw/sparc/sun4m.c
View File

@ -242,7 +242,8 @@ static unsigned long sun4m_load_kernel(const char *kernel_filename,
#endif #endif
kernel_size = load_elf(kernel_filename, NULL, kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, NULL, translate_kernel_address, NULL,
NULL, NULL, NULL, NULL, 1, EM_SPARC, 0, 0); NULL, NULL, NULL, NULL,
ELFDATA2MSB, EM_SPARC, 0, 0);
if (kernel_size < 0) if (kernel_size < 0)
kernel_size = load_aout(kernel_filename, KERNEL_LOAD_ADDR, kernel_size = load_aout(kernel_filename, KERNEL_LOAD_ADDR,
RAM_size - KERNEL_LOAD_ADDR, bswap_needed, RAM_size - KERNEL_LOAD_ADDR, bswap_needed,
@ -703,7 +704,7 @@ static void prom_init(hwaddr addr, const char *bios_name)
if (filename) { if (filename) {
ret = load_elf(filename, NULL, ret = load_elf(filename, NULL,
translate_prom_address, &addr, NULL, translate_prom_address, &addr, NULL,
NULL, NULL, NULL, 1, EM_SPARC, 0, 0); NULL, NULL, NULL, ELFDATA2MSB, EM_SPARC, 0, 0);
if (ret < 0 || ret > PROM_SIZE_MAX) { if (ret < 0 || ret > PROM_SIZE_MAX) {
ret = load_image_targphys(filename, addr, PROM_SIZE_MAX); ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);
} }

6
hw/sparc64/sun4u.c
View File

@ -176,8 +176,8 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename,
bswap_needed = 0; bswap_needed = 0;
#endif #endif
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_entry, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_entry,
kernel_addr, &kernel_top, NULL, 1, EM_SPARCV9, 0, kernel_addr, &kernel_top, NULL,
0); ELFDATA2MSB, EM_SPARCV9, 0, 0);
if (kernel_size < 0) { if (kernel_size < 0) {
*kernel_addr = KERNEL_LOAD_ADDR; *kernel_addr = KERNEL_LOAD_ADDR;
*kernel_entry = KERNEL_LOAD_ADDR; *kernel_entry = KERNEL_LOAD_ADDR;
@ -441,7 +441,7 @@ static void prom_init(hwaddr addr, const char *bios_name)
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) { if (filename) {
ret = load_elf(filename, NULL, translate_prom_address, &addr, ret = load_elf(filename, NULL, translate_prom_address, &addr,
NULL, NULL, NULL, NULL, 1, EM_SPARCV9, 0, 0); NULL, NULL, NULL, NULL, ELFDATA2MSB, EM_SPARCV9, 0, 0);
if (ret < 0 || ret > PROM_SIZE_MAX) { if (ret < 0 || ret > PROM_SIZE_MAX) {
ret = load_image_targphys(filename, addr, PROM_SIZE_MAX); ret = load_image_targphys(filename, addr, PROM_SIZE_MAX);
} }

2
hw/tricore/triboard.c
View File

@ -39,7 +39,7 @@ static void tricore_load_kernel(TriCoreCPU *cpu, const char *kernel_filename)
kernel_size = load_elf(kernel_filename, NULL, kernel_size = load_elf(kernel_filename, NULL,
NULL, NULL, &entry, NULL, NULL, NULL, &entry, NULL,
NULL, NULL, 0, NULL, NULL, ELFDATA2LSB,
EM_TRICORE, 1, 0); EM_TRICORE, 1, 0);
if (kernel_size <= 0) { if (kernel_size <= 0) {
error_report("no kernel file '%s'", kernel_filename); error_report("no kernel file '%s'", kernel_filename);

2
hw/tricore/tricore_testboard.c
View File

@ -42,7 +42,7 @@ static void tricore_load_kernel(CPUTriCoreState *env)
kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL, kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL,
NULL, NULL, &entry, NULL, NULL, NULL, &entry, NULL,
NULL, NULL, 0, NULL, NULL, ELFDATA2LSB,
EM_TRICORE, 1, 0); EM_TRICORE, 1, 0);
if (kernel_size <= 0) { if (kernel_size <= 0) {
error_report("no kernel file '%s'", error_report("no kernel file '%s'",

3
hw/xtensa/sim.c
View File

@ -100,7 +100,8 @@ void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine)
if (kernel_filename) { if (kernel_filename) {
uint64_t elf_entry; uint64_t elf_entry;
int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu, int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu,
&elf_entry, NULL, NULL, NULL, TARGET_BIG_ENDIAN, &elf_entry, NULL, NULL, NULL,
TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB,
EM_XTENSA, 0, 0); EM_XTENSA, 0, 0);
if (success > 0) { if (success > 0) {

3
hw/xtensa/xtfpga.c
View File

@ -398,7 +398,8 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
uint64_t elf_entry; uint64_t elf_entry;
int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu, int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu,
&elf_entry, NULL, NULL, NULL, TARGET_BIG_ENDIAN, &elf_entry, NULL, NULL, NULL,
TARGET_BIG_ENDIAN ? ELFDATA2MSB : ELFDATA2LSB,
EM_XTENSA, 0, 0); EM_XTENSA, 0, 0);
if (success > 0) { if (success > 0) {
entry_point = elf_entry; entry_point = elf_entry;

2
include/hw/loader.h
View File

@ -174,7 +174,7 @@ ssize_t load_elf(const char *filename,
uint64_t (*elf_note_fn)(void *, void *, bool), uint64_t (*elf_note_fn)(void *, void *, bool),
uint64_t (*translate_fn)(void *, uint64_t), uint64_t (*translate_fn)(void *, uint64_t),
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr, void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
uint64_t *highaddr, uint32_t *pflags, int big_endian, uint64_t *highaddr, uint32_t *pflags, int elf_data_order,
int elf_machine, int clear_lsb, int data_swab); int elf_machine, int clear_lsb, int data_swab);
/** load_elf_hdr: /** load_elf_hdr: