From 6cdda0ff4bad7edbb4c94a52234138bf2ac9a6b6 Mon Sep 17 00:00:00 2001 From: Aleksandar Markovic Date: Sun, 26 Jan 2020 23:55:04 +0100 Subject: hw/core/loader: Let load_elf() populate a field with CPU-specific flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While loading the executable, some platforms (like AVR) need to detect CPU type that executable is built for - and, with this patch, this is enabled by reading the field 'e_flags' of the ELF header of the executable in question. The change expands functionality of the following functions: - load_elf() - load_elf_as() - load_elf_ram() - load_elf_ram_sym() The argument added to these functions is called 'pflags' and is of type 'uint32_t*' (that matches 'pointer to 'elf_word'', 'elf_word' being the type of the field 'e_flags', in both 32-bit and 64-bit variants of ELF header). Callers are allowed to pass NULL as that argument, and in such case no lookup to the field 'e_flags' will happen, and no information will be returned, of course. CC: Richard Henderson CC: Peter Maydell CC: Edgar E. Iglesias CC: Michael Walle CC: Thomas Huth CC: Laurent Vivier CC: Philippe Mathieu-Daudé CC: Aleksandar Rikalo CC: Aurelien Jarno CC: Jia Liu CC: David Gibson CC: Mark Cave-Ayland CC: BALATON Zoltan CC: Christian Borntraeger CC: Thomas Huth CC: Artyom Tarasenko CC: Fabien Chouteau CC: KONRAD Frederic CC: Max Filippov Reviewed-by: Aleksandar Rikalo Signed-off-by: Michael Rolnik Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Aleksandar Markovic Message-Id: <1580079311-20447-24-git-send-email-aleksandar.markovic@rt-rk.com> --- hw/pci-host/prep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/pci-host/prep.c') diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index f2f8821..1aff72b 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -335,7 +335,8 @@ static void raven_realize(PCIDevice *d, Error **errp) if (filename) { if (s->elf_machine != EM_NONE) { bios_size = load_elf(filename, NULL, NULL, NULL, NULL, - NULL, NULL, 1, s->elf_machine, 0, 0); + NULL, NULL, NULL, 1, s->elf_machine, + 0, 0); } if (bios_size < 0) { bios_size = get_image_size(filename); -- cgit v1.1