From 7bfd6c0e09971b3e85425750762e8041e791ee22 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 19 Nov 2025 14:08:51 +0100 Subject: [PATCH] hw/core/loader: Make load_elf_hdr() return bool, simplify caller Signed-off-by: Markus Armbruster Message-ID: <20251119130855.105479-2-armbru@redhat.com> Reviewed-by: Richard Henderson Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Peter Xu Reviewed-by: Daniel Henrique Barboza Reviewed-by: Zhao Liu --- hw/arm/boot.c | 6 +----- hw/core/loader.c | 8 ++++++-- hw/riscv/spike.c | 10 +--------- include/hw/core/loader.h | 4 +++- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 0ba3adaf81..e22609de93 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -766,16 +766,12 @@ static ssize_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry, int data_swab = 0; int elf_data_order; ssize_t ret; - Error *err = NULL; - - load_elf_hdr(info->kernel_filename, &elf_header, &elf_is64, &err); - if (err) { + if (!load_elf_hdr(info->kernel_filename, &elf_header, &elf_is64, NULL)) { /* * If the file is not an ELF file we silently return. * The caller will fall back to try other formats. */ - error_free(err); return -1; } diff --git a/hw/core/loader.c b/hw/core/loader.c index 8252616fdd..89d67d2760 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -364,8 +364,9 @@ const char *load_elf_strerror(ssize_t error) } } -void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp) +bool load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp) { + bool ok = false; int fd; uint8_t e_ident_local[EI_NIDENT]; uint8_t *e_ident; @@ -380,7 +381,7 @@ void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp) fd = open(filename, O_RDONLY | O_BINARY); if (fd < 0) { error_setg_errno(errp, errno, "Failed to open file: %s", filename); - return; + return false; } if (read(fd, hdr, EI_NIDENT) != EI_NIDENT) { error_setg_errno(errp, errno, "Failed to read file: %s", filename); @@ -415,8 +416,11 @@ void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp) off += br; } + ok = true; + fail: close(fd); + return ok; } /* return < 0 if error, otherwise the number of bytes loaded in memory */ diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 1493b928da..35c696f891 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -180,15 +180,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, static bool spike_test_elf_image(char *filename) { - Error *err = NULL; - - load_elf_hdr(filename, NULL, NULL, &err); - if (err) { - error_free(err); - return false; - } else { - return true; - } + return load_elf_hdr(filename, NULL, NULL, NULL); } static void spike_board_init(MachineState *machine) diff --git a/include/hw/core/loader.h b/include/hw/core/loader.h index d035e72748..6f91703503 100644 --- a/include/hw/core/loader.h +++ b/include/hw/core/loader.h @@ -188,8 +188,10 @@ ssize_t load_elf(const char *filename, * * Inspect an ELF file's header. Read its full header contents into a * buffer and/or determine if the ELF is 64bit. + * + * Returns true on success, false on failure. */ -void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp); +bool load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp); ssize_t load_aout(const char *filename, hwaddr addr, int max_sz, bool big_endian, hwaddr target_page_size);