If the caller didn't specify an architecture for the ELF machine
the load_elf() function will auto detect it based on the ELF file.
Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
---
V7:
- Fix typo
hw/core/loader.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 53e0e41..a8a372d 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -419,6 +419,7 @@ int load_elf(const char *filename, uint64_t
(*translate_fn)(void *, uint64_t),
{
int fd, data_order, target_data_order, must_swab, ret = ELF_LOAD_FAILED;
uint8_t e_ident[EI_NIDENT];
+ uint16_t e_machine;
fd = open(filename, O_RDONLY | O_BINARY);
if (fd < 0) {
@@ -451,6 +452,15 @@ int load_elf(const char *filename, uint64_t
(*translate_fn)(void *, uint64_t),
goto fail;
}
+ if (elf_machine < 1) {
+ /* The caller didn't specify an ARCH, we can figure it out */
+ lseek(fd, 0x12, SEEK_SET);
+ if (read(fd, &e_machine, sizeof(e_machine)) != sizeof(e_machine)) {
+ goto fail;
+ }
+ elf_machine = e_machine;
+ }
+
lseek(fd, 0, SEEK_SET);
if (e_ident[EI_CLASS] == ELFCLASS64) {
ret = load_elf64(filename, fd, translate_fn, translate_opaque,
must_swab,
--
2.7.4
