From 617160c9e1f8022563c33aa7fd204535d4d49f8c Mon Sep 17 00:00:00 2001 From: BALATON Zoltan Date: Sun, 5 Jul 2020 19:22:11 +0200 Subject: load_elf: Remove unused address variables from callers Several callers of load_elf() pass pointers for lowaddr and highaddr parameters which are then not used for anything. This may stem from a misunderstanding that load_elf need a value here but in fact it can take NULL to ignore these values. Remove such unused variables and pass NULL instead from callers that don't need these. Signed-off-by: BALATON Zoltan Reviewed-by: David Gibson Reviewed-by: Alistair Francis Acked-by: David Gibson Acked-by: Max Filippov Message-Id: <20200705174020.BDD0174633F@zero.eik.bme.hu> Signed-off-by: Alistair Francis --- hw/xtensa/sim.c | 3 +-- hw/xtensa/xtfpga.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'hw/xtensa') diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index aeb46d8..cbac50d 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -106,9 +106,8 @@ void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine) if (kernel_filename) { uint64_t elf_entry; - uint64_t elf_lowaddr; int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu, - &elf_entry, &elf_lowaddr, NULL, NULL, big_endian, + &elf_entry, NULL, NULL, NULL, big_endian, EM_XTENSA, 0, 0); if (success > 0) { diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 10de158..b1470b8 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -413,9 +413,8 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine) env->regs[2] = tagptr; uint64_t elf_entry; - uint64_t elf_lowaddr; int success = load_elf(kernel_filename, NULL, translate_phys_addr, cpu, - &elf_entry, &elf_lowaddr, NULL, NULL, be, EM_XTENSA, 0, 0); + &elf_entry, NULL, NULL, NULL, be, EM_XTENSA, 0, 0); if (success > 0) { entry_point = elf_entry; } else { -- cgit v1.1