From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39160C2D0DB for ; Tue, 28 Jan 2020 13:29:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD4AD24686 for ; Tue, 28 Jan 2020 13:29:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b117bnHv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD4AD24686 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwQvj-00072a-So for qemu-devel@archiver.kernel.org; Tue, 28 Jan 2020 08:29:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60950) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwQuQ-0006bD-2T for qemu-devel@nongnu.org; Tue, 28 Jan 2020 08:28:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwQuH-0000EM-I5 for qemu-devel@nongnu.org; Tue, 28 Jan 2020 08:28:01 -0500 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:37513) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iwQuH-0000Bo-4a for qemu-devel@nongnu.org; Tue, 28 Jan 2020 08:27:53 -0500 Received: by mail-ot1-x344.google.com with SMTP id d3so11652184otp.4 for ; Tue, 28 Jan 2020 05:27:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=wKyisj4rqRijfoFDDFAvMU0V3FFX79B/V3rlQGKa88M=; b=b117bnHvH6ROMbcXQoxU2JtubntbV/zQZIKQcncig0c+rOE/Mh9L0xkJhwDe0f2QIs 3FPqShDSmh/gMQtEVLTFzeW7I0DBQRRQV9pktCygpqJm+PGF3MbQOmGhkW1fgocICV78 QKhIOKZbZr2LWtbJmQR1zaIK5dcmLkHsh+gA6sTad/eATS8B/rvn8LxI+b7UnSxqLwjC 28wzFKwnaXsoAzCCpQrML4sN57uuA7LnOASTL8azrlj9n+3C4COZDlqwPqRlnAYY/K7Y qnL3wTanU7i/pjv5FYd8697ooWeqKIhTeGhRwHrSW3LYIQCcsJNtNGerfMgZOkEyxjsY Ro2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=wKyisj4rqRijfoFDDFAvMU0V3FFX79B/V3rlQGKa88M=; b=Ybx328AWLjOndH5ITwiwn6L5yrH3jNDy+DMUO0W/MfwU+AbhVnxS5XNBMxGQg7EayI oK6CtwEz8qWN6XEKwNutWDcLunnsRSZbM3G6MvEx7HM46DSoQO7Yd8R9VDWTndyNdSD2 NY6lzrmC9PjmZUSt9Bkxm8lla9l7VwV87VO8j8wQLzc7nbH1AWLmhbsP2x+MsHt1+X1H pttY+krOddCPl+w61O7AcwwD+ch07JUqsjyqz4xnamzgibEFVQuR/wkyPIY9pRYfKfmL RiLvskOBmGGXBLwjJQd6r/mBhc37kQs2lvt0xs8nLPnBnLmLosZmJ13LKc4uJIeST9zS dO2g== X-Gm-Message-State: APjAAAVmj4a9NDkbJ9DvtmKmXUIVTunhrM8zncbpjNu5fiCQMlI1NOit mlSXVhn+6VvvEZKfSWr3Urg9u9zlGGMmL31nrzg= X-Google-Smtp-Source: APXvYqxD95eJUNKzehJCfRcn6xlkGHMkwOXoMR4F8pw9ozgZ7MJj8y9vybdAzd8hhK7uNYlBzj3cxbCSaEzoBu4UmCc= X-Received: by 2002:a9d:831:: with SMTP id 46mr4712392oty.295.1580218072193; Tue, 28 Jan 2020 05:27:52 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a9d:d21:0:0:0:0:0 with HTTP; Tue, 28 Jan 2020 05:27:51 -0800 (PST) In-Reply-To: References: <1580079311-20447-1-git-send-email-aleksandar.markovic@rt-rk.com> <1580079311-20447-24-git-send-email-aleksandar.markovic@rt-rk.com> From: Aleksandar Markovic Date: Tue, 28 Jan 2020 14:27:51 +0100 Message-ID: Subject: Re: [PATCH rc3 23/30] hw/core/loader: Let load_elf populate the processor-specific flags To: BALATON Zoltan Content-Type: multipart/alternative; boundary="000000000000dc5dae059d333090" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::344 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Jia Liu , Max Filippov , Christian Borntraeger , Thomas Huth , KONRAD Frederic , Mark Cave-Ayland , "qemu-devel@nongnu.org" , Fabien Chouteau , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Aleksandar Markovic , Laurent Vivier , Michael Walle , Michael Rolnik , Artyom Tarasenko , "Edgar E . Iglesias" , Aleksandar Rikalo , David Gibson , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000dc5dae059d333090 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tuesday, January 28, 2020, BALATON Zoltan wrote: > On Tue, 28 Jan 2020, Aleksandar Markovic wrote: > >> On Sunday, January 26, 2020, Aleksandar Markovic < >> aleksandar.markovic@rt-rk.com> wrote: >> >> From: Philippe Mathieu-Daud=C3=A9 >>> >>> Some platforms (like AVR) need to determine cpu type by reading >>> the ELF flags (field e_flags oin ELF header). >>> >>> This patch enables discovery of the content of that flag while >>> using following functions: >>> >>> - load_elf() >>> - load_elf_as() >>> - load_elf_ram() >>> - load_elf_ram_sym() >>> >>> The added argument of these functions is of type uint32_t*. It is >>> allowed to pass NULL as that argument, and in such case no lookup >>> to the field e_flags will happen, and of course, no information >>> will be returned to the caller. >>> >>> >>> We plan to use this new functionality for MIPS Malta board, for detecti= on >> of incompatible cpu/kernel combinations, and graceful exit (right now >> these >> combinations result in hang or crash). I would say other boards could ma= ke >> use of it too. >> >> For that reason, if there is no objection, I plan to select this patch f= or >> next MIPS queue. >> > > No objection but kind of d=C3=A9j=C3=A0 vu: > > https://lists.nongnu.org/archive/html/qemu-devel/2019-01/msg03427.html > > I still think the interface of load_elf may need to be rethinked but I > don't know a good way. > Perhaps having only two, "in" and "out", arguments that are pointers to structures? Another thing that I noticed is "endian argument" that it seems everyone uses in a different way: 0, 1, true, false, bigendian, etc. Would c enumeration help? This looks to me like a time ticking bomb. Just to add that some platforms like MIPS and SPARC must load elfs of more than one value of EM_MACHINE (in MIPS case, EM_MIPS and EM_NANOMIPS) and current load_elf() interface offers only clumsy solutions/workarounds in these cases. Let's think about everything later on. > This could be fixed in a later patch causing more code churn again > though, so if there's a way to fix this it might be a good opportunity no= w. > But I don't want to hold your patch series back so unless someone has a > good idea to avoid this situation then we have to live with it. > > Thank you. I will do some minor corrections for obvious unclarities and typos in the commit message while applying to my qieue. > Regards, > BALATON Zoltan > > >> Regards, >> Aleksandar >> >> >> >> >> CC: Richard Henderson >>> CC: Peter Maydell >>> CC: Edgar E. Iglesias >>> CC: Michael Walle >>> CC: Thomas Huth >>> CC: Laurent Vivier >>> CC: Philippe Mathieu-Daud=C3=A9 >>> 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 >>> >>> Signed-off-by: Michael Rolnik >>> Reviewed-by: Aleksandar Markovic >>> [PMD: Extracted from bigger patch, >>> Replaced 'uint32_t *pe_flags' by 'int proc_flags'] >>> [AM: Replaced 'int proc_flags' with 'uint32_t *pflags', >>> replaced one instance of 'elf_sword' to 'elf_word', >>> extended functionality to load_elf()] >>> Signed-off-by: Philippe Mathieu-Daud=C3=A9 >>> Signed-off-by: Aleksandar Markovic >>> --- >>> hw/alpha/dp264.c | 4 ++-- >>> hw/arm/armv7m.c | 2 +- >>> hw/arm/boot.c | 2 +- >>> hw/core/generic-loader.c | 2 +- >>> hw/core/loader.c | 37 +++++++++++++++++++----------- >>> ------- >>> hw/cris/boot.c | 2 +- >>> hw/hppa/machine.c | 4 ++-- >>> hw/i386/multiboot.c | 2 +- >>> hw/i386/x86.c | 2 +- >>> hw/lm32/lm32_boards.c | 4 ++-- >>> hw/lm32/milkymist.c | 2 +- >>> hw/m68k/an5206.c | 2 +- >>> hw/m68k/mcf5208.c | 2 +- >>> hw/m68k/q800.c | 2 +- >>> hw/microblaze/boot.c | 4 ++-- >>> hw/mips/mips_fulong2e.c | 2 +- >>> hw/mips/mips_malta.c | 3 ++- >>> hw/mips/mips_mipssim.c | 2 +- >>> hw/mips/mips_r4k.c | 2 +- >>> hw/moxie/moxiesim.c | 2 +- >>> hw/nios2/boot.c | 4 ++-- >>> hw/openrisc/openrisc_sim.c | 2 +- >>> hw/pci-host/prep.c | 3 ++- >>> hw/ppc/e500.c | 2 +- >>> hw/ppc/mac_newworld.c | 4 ++-- >>> hw/ppc/mac_oldworld.c | 4 ++-- >>> hw/ppc/ppc440_bamboo.c | 2 +- >>> hw/ppc/sam460ex.c | 3 ++- >>> hw/ppc/spapr.c | 6 +++--- >>> hw/ppc/virtex_ml507.c | 2 +- >>> hw/riscv/boot.c | 4 ++-- >>> hw/s390x/ipl.c | 7 ++++--- >>> hw/sparc/leon3.c | 2 +- >>> hw/sparc/sun4m.c | 4 ++-- >>> hw/sparc64/sun4u.c | 5 +++-- >>> hw/tricore/tricore_testboard.c | 2 +- >>> hw/xtensa/sim.c | 2 +- >>> hw/xtensa/xtfpga.c | 2 +- >>> include/hw/elf_ops.h | 6 +++++- >>> include/hw/loader.h | 21 ++++++++++++--------- >>> 40 files changed, 92 insertions(+), 79 deletions(-) >>> >>> diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c >>> index f2026fd..a8f9a89 100644 >>> --- a/hw/alpha/dp264.c >>> +++ b/hw/alpha/dp264.c >>> @@ -115,7 +115,7 @@ static void clipper_init(MachineState *machine) >>> exit(1); >>> } >>> size =3D load_elf(palcode_filename, NULL, cpu_alpha_superpage_to_p= hys, >>> - NULL, &palcode_entry, &palcode_low, &palcode_high, >>> + NULL, &palcode_entry, &palcode_low, &palcode_high, >>> NULL, >>> 0, EM_ALPHA, 0, 0); >>> if (size < 0) { >>> error_report("could not load palcode '%s'", palcode_filename); >>> @@ -134,7 +134,7 @@ static void clipper_init(MachineState *machine) >>> uint64_t param_offset; >>> >>> size =3D load_elf(kernel_filename, NULL, >>> cpu_alpha_superpage_to_phys, >>> - NULL, &kernel_entry, &kernel_low, &kernel_high= , >>> + NULL, &kernel_entry, &kernel_low, &kernel_high= , >>> NULL, >>> 0, EM_ALPHA, 0, 0); >>> if (size < 0) { >>> error_report("could not load kernel '%s'", kernel_filename= ); >>> diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c >>> index 7a3c48f..e4fc9a8 100644 >>> --- a/hw/arm/armv7m.c >>> +++ b/hw/arm/armv7m.c >>> @@ -331,7 +331,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char >>> *kernel_filename, int mem_size) >>> >>> if (kernel_filename) { >>> image_size =3D load_elf_as(kernel_filename, NULL, NULL, NULL, >>> - &entry, &lowaddr, >>> + &entry, &lowaddr, NULL, >>> NULL, big_endian, EM_ARM, 1, 0, as); >>> if (image_size < 0) { >>> image_size =3D load_image_targphys_as(kernel_filename, 0, >>> diff --git a/hw/arm/boot.c b/hw/arm/boot.c >>> index 8fb4a63..0c213ca 100644 >>> --- a/hw/arm/boot.c >>> +++ b/hw/arm/boot.c >>> @@ -903,7 +903,7 @@ static int64_t arm_load_elf(struct arm_boot_info >>> *info, uint64_t *pentry, >>> } >>> >>> ret =3D load_elf_as(info->kernel_filename, NULL, NULL, NULL, >>> - pentry, lowaddr, highaddr, big_endian, >>> elf_machine, >>> + pentry, lowaddr, highaddr, NULL, big_endian, >>> elf_machine, >>> 1, data_swab, as); >>> if (ret <=3D 0) { >>> /* The header loaded but the image didn't */ >>> diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c >>> index 4b1fc86..1e5ccb7 100644 >>> --- a/hw/core/generic-loader.c >>> +++ b/hw/core/generic-loader.c >>> @@ -140,7 +140,7 @@ static void generic_loader_realize(DeviceState *dev= , >>> Error **errp) >>> >>> if (!s->force_raw) { >>> size =3D load_elf_as(s->file, NULL, NULL, NULL, &entry, NU= LL, >>> NULL, >>> - big_endian, 0, 0, 0, as); >>> + NULL, big_endian, 0, 0, 0, as); >>> >>> if (size < 0) { >>> size =3D load_uimage_as(s->file, &entry, NULL, NULL, N= ULL, >>> NULL, >>> diff --git a/hw/core/loader.c b/hw/core/loader.c >>> index 5099f27..d1b78f6 100644 >>> --- a/hw/core/loader.c >>> +++ b/hw/core/loader.c >>> @@ -406,12 +406,12 @@ int load_elf(const char *filename, >>> uint64_t (*elf_note_fn)(void *, void *, bool), >>> uint64_t (*translate_fn)(void *, uint64_t), >>> void *translate_opaque, uint64_t *pentry, uint64_t >>> *lowaddr, >>> - uint64_t *highaddr, int big_endian, int elf_machine, >>> - int clear_lsb, int data_swab) >>> + uint64_t *highaddr, uint32_t *pflags, int big_endian, >>> + int elf_machine, int clear_lsb, int data_swab) >>> { >>> return load_elf_as(filename, elf_note_fn, translate_fn, >>> translate_opaque, >>> - pentry, lowaddr, highaddr, big_endian, >>> elf_machine, >>> - clear_lsb, data_swab, NULL); >>> + pentry, lowaddr, highaddr, pflags, big_endian, >>> + elf_machine, clear_lsb, data_swab, NULL); >>> } >>> >>> /* return < 0 if error, otherwise the number of bytes loaded in memory >>> */ >>> @@ -419,12 +419,12 @@ int load_elf_as(const char *filename, >>> uint64_t (*elf_note_fn)(void *, void *, bool), >>> uint64_t (*translate_fn)(void *, uint64_t), >>> void *translate_opaque, uint64_t *pentry, uint64_t >>> *lowaddr, >>> - uint64_t *highaddr, int big_endian, int elf_machine, >>> - int clear_lsb, int data_swab, AddressSpace *as) >>> + uint64_t *highaddr, uint32_t *pflags, int big_endian, >>> + int elf_machine, int clear_lsb, int data_swab, >>> AddressSpace *as) >>> { >>> return load_elf_ram(filename, elf_note_fn, translate_fn, >>> translate_opaque, >>> - pentry, lowaddr, highaddr, big_endian, >>> elf_machine, >>> - clear_lsb, data_swab, as, true); >>> + pentry, lowaddr, highaddr, pflags, big_endian, >>> + elf_machine, clear_lsb, data_swab, as, true); >>> } >>> >>> /* return < 0 if error, otherwise the number of bytes loaded in memory >>> */ >>> @@ -432,13 +432,13 @@ int load_elf_ram(const char *filename, >>> uint64_t (*elf_note_fn)(void *, void *, bool), >>> uint64_t (*translate_fn)(void *, uint64_t), >>> void *translate_opaque, uint64_t *pentry, uint64_t >>> *lowaddr, >>> - uint64_t *highaddr, int big_endian, int elf_machine, >>> - int clear_lsb, int data_swab, AddressSpace *as, >>> - bool load_rom) >>> + uint64_t *highaddr, uint32_t *pflags, int big_endian, >>> + int elf_machine, int clear_lsb, int data_swab, >>> + AddressSpace *as, bool load_rom) >>> { >>> return load_elf_ram_sym(filename, elf_note_fn, >>> translate_fn, translate_opaque, >>> - pentry, lowaddr, highaddr, big_endian, >>> + pentry, lowaddr, highaddr, pflags, >>> big_endian, >>> elf_machine, clear_lsb, data_swab, as, >>> load_rom, NULL); >>> } >>> @@ -448,8 +448,9 @@ int load_elf_ram_sym(const char *filename, >>> uint64_t (*elf_note_fn)(void *, void *, bool), >>> uint64_t (*translate_fn)(void *, uint64_t), >>> void *translate_opaque, uint64_t *pentry, >>> - uint64_t *lowaddr, uint64_t *highaddr, int >>> big_endian, >>> - int elf_machine, int clear_lsb, int data_swab, >>> + uint64_t *lowaddr, uint64_t *highaddr, uint32_t >>> *pflags, >>> + int big_endian, int elf_machine, >>> + int clear_lsb, int data_swab, >>> AddressSpace *as, bool load_rom, symbol_fn_t >>> sym_cb) >>> { >>> int fd, data_order, target_data_order, must_swab, ret =3D >>> ELF_LOAD_FAILED; >>> @@ -490,13 +491,13 @@ int load_elf_ram_sym(const char *filename, >>> if (e_ident[EI_CLASS] =3D=3D ELFCLASS64) { >>> ret =3D load_elf64(filename, fd, elf_note_fn, >>> translate_fn, translate_opaque, must_swab, >>> - pentry, lowaddr, highaddr, elf_machine, >>> clear_lsb, >>> - data_swab, as, load_rom, sym_cb); >>> + pentry, lowaddr, highaddr, pflags, elf_machin= e, >>> + clear_lsb, data_swab, as, load_rom, sym_cb); >>> } else { >>> ret =3D load_elf32(filename, fd, elf_note_fn, >>> translate_fn, translate_opaque, must_swab, >>> - pentry, lowaddr, highaddr, elf_machine, >>> clear_lsb, >>> - data_swab, as, load_rom, sym_cb); >>> + pentry, lowaddr, highaddr, pflags, elf_machin= e, >>> + clear_lsb, data_swab, as, load_rom, sym_cb); >>> } >>> >>> fail: >>> diff --git a/hw/cris/boot.c b/hw/cris/boot.c >>> index 2d2cc0c..b8947bc 100644 >>> --- a/hw/cris/boot.c >>> +++ b/hw/cris/boot.c >>> @@ -76,7 +76,7 @@ void cris_load_image(CRISCPU *cpu, struct >>> cris_load_info >>> *li) >>> devboard SDK. */ >>> image_size =3D load_elf(li->image_filename, NULL, >>> translate_kernel_address, NULL, >>> - &entry, NULL, &high, 0, EM_CRIS, 0, 0); >>> + &entry, NULL, &high, NULL, 0, EM_CRIS, 0, 0)= ; >>> li->entry =3D entry; >>> if (image_size < 0) { >>> /* Takes a kimage from the axis devboard SDK. */ >>> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c >>> index 5d0de26..0ab36cf 100644 >>> --- a/hw/hppa/machine.c >>> +++ b/hw/hppa/machine.c >>> @@ -140,7 +140,7 @@ static void machine_hppa_init(MachineState *machine= ) >>> } >>> >>> size =3D load_elf(firmware_filename, NULL, NULL, NULL, >>> - &firmware_entry, &firmware_low, &firmware_high, >>> + &firmware_entry, &firmware_low, &firmware_high, >>> NULL, >>> true, EM_PARISC, 0, 0); >>> >>> /* Unfortunately, load_elf sign-extends reading elf32. */ >>> @@ -169,7 +169,7 @@ static void machine_hppa_init(MachineState *machine= ) >>> /* Load kernel */ >>> if (kernel_filename) { >>> size =3D load_elf(kernel_filename, NULL, &cpu_hppa_to_phys, >>> - NULL, &kernel_entry, &kernel_low, &kernel_high= , >>> + NULL, &kernel_entry, &kernel_low, &kernel_high= , >>> NULL, >>> true, EM_PARISC, 0, 0); >>> >>> /* Unfortunately, load_elf sign-extends reading elf32. */ >>> diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c >>> index 9a59f95..9e7d69d 100644 >>> --- a/hw/i386/multiboot.c >>> +++ b/hw/i386/multiboot.c >>> @@ -199,7 +199,7 @@ int load_multiboot(FWCfgState *fw_cfg, >>> } >>> >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> &elf_entry, >>> - &elf_low, &elf_high, 0, I386_ELF_MACHIN= E, >>> + &elf_low, &elf_high, NULL, 0, >>> I386_ELF_MACHINE, >>> 0, 0); >>> if (kernel_size < 0) { >>> error_report("Error while loading elf kernel"); >>> diff --git a/hw/i386/x86.c b/hw/i386/x86.c >>> index 9b9a4d5..7f38e6b 100644 >>> --- a/hw/i386/x86.c >>> +++ b/hw/i386/x86.c >>> @@ -413,7 +413,7 @@ static bool load_elfboot(const char *kernel_filenam= e, >>> uint64_t elf_note_type =3D XEN_ELFNOTE_PHYS32_ENTRY; >>> kernel_size =3D load_elf(kernel_filename, read_pvh_start_addr, >>> NULL, &elf_note_type, &elf_entry, >>> - &elf_low, &elf_high, 0, I386_ELF_MACHINE, >>> + &elf_low, &elf_high, NULL, 0, >>> I386_ELF_MACHINE, >>> 0, 0); >>> >>> if (kernel_size < 0) { >>> diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c >>> index 5ae308b..d1894ad 100644 >>> --- a/hw/lm32/lm32_boards.c >>> +++ b/hw/lm32/lm32_boards.c >>> @@ -138,7 +138,7 @@ static void lm32_evr_init(MachineState *machine) >>> int kernel_size; >>> >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &entry, NULL, NULL, >>> + &entry, NULL, NULL, NULL, >>> 1, EM_LATTICEMICO32, 0, 0); >>> reset_info->bootstrap_pc =3D entry; >>> >>> @@ -232,7 +232,7 @@ static void lm32_uclinux_init(MachineState *machine= ) >>> int kernel_size; >>> >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &entry, NULL, NULL, >>> + &entry, NULL, NULL, NULL, >>> 1, EM_LATTICEMICO32, 0, 0); >>> reset_info->bootstrap_pc =3D entry; >>> >>> diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c >>> index 460d322..6d46134 100644 >>> --- a/hw/lm32/milkymist.c >>> +++ b/hw/lm32/milkymist.c >>> @@ -177,7 +177,7 @@ milkymist_init(MachineState *machine) >>> >>> /* Boots a kernel elf binary. */ >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &entry, NULL, NULL, >>> + &entry, NULL, NULL, NULL, >>> 1, EM_LATTICEMICO32, 0, 0); >>> reset_info->bootstrap_pc =3D entry; >>> >>> diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c >>> index 54ccbe1..bed43a9 100644 >>> --- a/hw/m68k/an5206.c >>> +++ b/hw/m68k/an5206.c >>> @@ -65,7 +65,7 @@ static void an5206_init(MachineState *machine) >>> } >>> >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> &elf_entry, >>> - NULL, NULL, 1, EM_68K, 0, 0); >>> + NULL, NULL, NULL, 1, EM_68K, 0, 0); >>> entry =3D elf_entry; >>> if (kernel_size < 0) { >>> kernel_size =3D load_uimage(kernel_filename, &entry, NULL, NUL= L, >>> diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c >>> index 158c5e4..a999c21 100644 >>> --- a/hw/m68k/mcf5208.c >>> +++ b/hw/m68k/mcf5208.c >>> @@ -329,7 +329,7 @@ static void mcf5208evb_init(MachineState *machine) >>> } >>> >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> &elf_entry, >>> - NULL, NULL, 1, EM_68K, 0, 0); >>> + NULL, NULL, NULL, 1, EM_68K, 0, 0); >>> entry =3D elf_entry; >>> if (kernel_size < 0) { >>> kernel_size =3D load_uimage(kernel_filename, &entry, NULL, NUL= L, >>> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c >>> index 12491ec..1e32363 100644 >>> --- a/hw/m68k/q800.c >>> +++ b/hw/m68k/q800.c >>> @@ -342,7 +342,7 @@ static void q800_init(MachineState *machine) >>> if (linux_boot) { >>> uint64_t high; >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &elf_entry, NULL, &high, 1, >>> + &elf_entry, NULL, &high, NULL, 1, >>> EM_68K, 0, 0); >>> if (kernel_size < 0) { >>> error_report("could not load kernel '%s'", kernel_filename= ); >>> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c >>> index d1d7dfb..925e3f7 100644 >>> --- a/hw/microblaze/boot.c >>> +++ b/hw/microblaze/boot.c >>> @@ -145,13 +145,13 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, >>> hwaddr ddr_base, >>> >>> /* Boots a kernel elf binary. */ >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &entry, &low, &high, >>> + &entry, &low, &high, NULL, >>> big_endian, EM_MICROBLAZE, 0, 0); >>> base32 =3D entry; >>> if (base32 =3D=3D 0xc0000000) { >>> kernel_size =3D load_elf(kernel_filename, NULL, >>> translate_kernel_address, NULL, >>> - &entry, NULL, NULL, >>> + &entry, NULL, NULL, NULL, >>> big_endian, EM_MICROBLAZE, 0, 0); >>> } >>> /* Always boot into physical ram. */ >>> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c >>> index 9eaa6e2..2e043cb 100644 >>> --- a/hw/mips/mips_fulong2e.c >>> +++ b/hw/mips/mips_fulong2e.c >>> @@ -119,7 +119,7 @@ static int64_t load_kernel(CPUMIPSState *env) >>> cpu_mips_kseg0_to_phys, NULL, >>> (uint64_t *)&kernel_entry, >>> (uint64_t *)&kernel_low, (uint64_t >>> *)&kernel_high, >>> - 0, EM_MIPS, 1, 0); >>> + NULL, 0, EM_MIPS, 1, 0); >>> if (kernel_size < 0) { >>> error_report("could not load kernel '%s': %s", >>> loaderparams.kernel_filename, >>> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c >>> index 5aaeaa8..34b76bb 100644 >>> --- a/hw/mips/mips_malta.c >>> +++ b/hw/mips/mips_malta.c >>> @@ -1039,7 +1039,8 @@ static int64_t load_kernel(void) >>> kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, >>> cpu_mips_kseg0_to_phys, NULL, >>> (uint64_t *)&kernel_entry, NULL, >>> - (uint64_t *)&kernel_high, big_endian, >>> EM_MIPS, >>> 1, 0); >>> + (uint64_t *)&kernel_high, NULL, big_endian, >>> EM_MIPS, >>> + 1, 0); >>> if (kernel_size < 0) { >>> error_report("could not load kernel '%s': %s", >>> loaderparams.kernel_filename, >>> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c >>> index 84c03dd..b934ca9 100644 >>> --- a/hw/mips/mips_mipssim.c >>> +++ b/hw/mips/mips_mipssim.c >>> @@ -74,7 +74,7 @@ static int64_t load_kernel(void) >>> kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, >>> cpu_mips_kseg0_to_phys, NULL, >>> (uint64_t *)&entry, NULL, >>> - (uint64_t *)&kernel_high, big_endian, >>> + (uint64_t *)&kernel_high, NULL, big_endian, >>> EM_MIPS, 1, 0); >>> if (kernel_size >=3D 0) { >>> if ((entry & ~0x7fffffffULL) =3D=3D 0x80000000) { >>> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c >>> index fd926a3..b2aec43 100644 >>> --- a/hw/mips/mips_r4k.c >>> +++ b/hw/mips/mips_r4k.c >>> @@ -98,7 +98,7 @@ static int64_t load_kernel(void) >>> kernel_size =3D load_elf(loaderparams.kernel_filename, NULL, >>> cpu_mips_kseg0_to_phys, NULL, >>> (uint64_t *)&entry, NULL, >>> - (uint64_t *)&kernel_high, big_endian, >>> + (uint64_t *)&kernel_high, NULL, big_endian, >>> EM_MIPS, 1, 0); >>> if (kernel_size >=3D 0) { >>> if ((entry & ~0x7fffffffULL) =3D=3D 0x80000000) { >>> diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c >>> index 57af1b4..1d06e39 100644 >>> --- a/hw/moxie/moxiesim.c >>> +++ b/hw/moxie/moxiesim.c >>> @@ -58,7 +58,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams >>> *loader_params) >>> ram_addr_t initrd_offset; >>> >>> kernel_size =3D load_elf(loader_params->kernel_filename, NULL, NU= LL, >>> NULL, >>> - &entry, &kernel_low, &kernel_high, 1, >>> EM_MOXIE, >>> + &entry, &kernel_low, &kernel_high, NULL, 1, >>> EM_MOXIE, >>> 0, 0); >>> >>> if (kernel_size <=3D 0) { >>> diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c >>> index d78bc9e..46b8349 100644 >>> --- a/hw/nios2/boot.c >>> +++ b/hw/nios2/boot.c >>> @@ -147,7 +147,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr >>> ddr_base, >>> >>> /* Boots a kernel elf binary. */ >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &entry, &low, &high, >>> + &entry, &low, &high, NULL, >>> big_endian, EM_ALTERA_NIOS2, 0, 0); >>> if ((uint32_t)entry =3D=3D 0xc0000000) { >>> /* >>> @@ -158,7 +158,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr >>> ddr_base, >>> */ >>> kernel_size =3D load_elf(kernel_filename, NULL, >>> translate_kernel_address, NULL, >>> - &entry, NULL, NULL, >>> + &entry, NULL, NULL, NULL, >>> big_endian, EM_ALTERA_NIOS2, 0, 0); >>> boot_info.bootstrap_pc =3D ddr_base + 0xc0000000 + >>> (entry & 0x07ffffff); >>> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c >>> index 79e7049..ad53712 100644 >>> --- a/hw/openrisc/openrisc_sim.c >>> +++ b/hw/openrisc/openrisc_sim.c >>> @@ -98,7 +98,7 @@ static void openrisc_load_kernel(ram_addr_t ram_size, >>> >>> if (kernel_filename && !qtest_enabled()) { >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &elf_entry, NULL, NULL, 1, EM_OPENRISC, >>> + &elf_entry, NULL, NULL, NULL, 1, >>> EM_OPENRISC, >>> 1, 0); >>> entry =3D elf_entry; >>> if (kernel_size < 0) { >>> diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c >>> index afa136d..fcf6235 100644 >>> --- a/hw/pci-host/prep.c >>> +++ b/hw/pci-host/prep.c >>> @@ -335,7 +335,8 @@ static void raven_realize(PCIDevice *d, Error **err= p) >>> if (filename) { >>> if (s->elf_machine !=3D EM_NONE) { >>> bios_size =3D load_elf(filename, NULL, NULL, NULL, NUL= L, >>> - NULL, NULL, 1, s->elf_machine, 0, >>> 0); >>> + NULL, NULL, NULL, 1, >>> s->elf_machine, >>> + 0, 0); >>> } >>> if (bios_size < 0) { >>> bios_size =3D get_image_size(filename); >>> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c >>> index 12b6a5b..886442e 100644 >>> --- a/hw/ppc/e500.c >>> +++ b/hw/ppc/e500.c >>> @@ -1049,7 +1049,7 @@ void ppce500_init(MachineState *machine) >>> filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, payload_name); >>> >>> payload_size =3D load_elf(filename, NULL, NULL, NULL, >>> - &bios_entry, &loadaddr, NULL, >>> + &bios_entry, &loadaddr, NULL, NULL, >>> 1, PPC_ELF_MACHINE, 0, 0); >>> if (payload_size < 0) { >>> /* >>> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c >>> index 3594517..464d012 100644 >>> --- a/hw/ppc/mac_newworld.c >>> +++ b/hw/ppc/mac_newworld.c >>> @@ -168,7 +168,7 @@ static void ppc_core99_init(MachineState *machine) >>> /* Load OpenBIOS (ELF) */ >>> if (filename) { >>> bios_size =3D load_elf(filename, NULL, NULL, NULL, NULL, >>> - NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0); >>> + NULL, NULL, NULL, 1, PPC_ELF_MACHINE, 0, >>> 0); >>> >>> g_free(filename); >>> } else { >>> @@ -192,7 +192,7 @@ static void ppc_core99_init(MachineState *machine) >>> >>> kernel_size =3D load_elf(kernel_filename, NULL, >>> translate_kernel_address, NULL, >>> - NULL, &lowaddr, NULL, 1, PPC_ELF_MACHIN= E, >>> + NULL, &lowaddr, NULL, NULL, 1, >>> PPC_ELF_MACHINE, >>> 0, 0); >>> if (kernel_size < 0) >>> kernel_size =3D load_aout(kernel_filename, kernel_base, >>> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c >>> index 0fa680b..7318d7e 100644 >>> --- a/hw/ppc/mac_oldworld.c >>> +++ b/hw/ppc/mac_oldworld.c >>> @@ -143,7 +143,7 @@ static void ppc_heathrow_init(MachineState *machine= ) >>> >>> /* Load OpenBIOS (ELF) */ >>> if (filename) { >>> - bios_size =3D load_elf(filename, NULL, 0, NULL, NULL, NULL, NU= LL, >>> + bios_size =3D load_elf(filename, NULL, 0, NULL, NULL, NULL, NU= LL, >>> NULL, >>> 1, PPC_ELF_MACHINE, 0, 0); >>> g_free(filename); >>> } else { >>> @@ -166,7 +166,7 @@ static void ppc_heathrow_init(MachineState *machine= ) >>> kernel_base =3D KERNEL_LOAD_ADDR; >>> kernel_size =3D load_elf(kernel_filename, NULL, >>> translate_kernel_address, NULL, >>> - NULL, &lowaddr, NULL, 1, PPC_ELF_MACHIN= E, >>> + NULL, &lowaddr, NULL, NULL, 1, >>> PPC_ELF_MACHINE, >>> 0, 0); >>> if (kernel_size < 0) >>> kernel_size =3D load_aout(kernel_filename, kernel_base, >>> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c >>> index b782641..da777ef 100644 >>> --- a/hw/ppc/ppc440_bamboo.c >>> +++ b/hw/ppc/ppc440_bamboo.c >>> @@ -253,7 +253,7 @@ static void bamboo_init(MachineState *machine) >>> NULL, NULL); >>> if (success < 0) { >>> success =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> &elf_entry, >>> - &elf_lowaddr, NULL, 1, PPC_ELF_MACHINE, >>> + &elf_lowaddr, NULL, NULL, 1, >>> PPC_ELF_MACHINE, >>> 0, 0); >>> entry =3D elf_entry; >>> loadaddr =3D elf_lowaddr; >>> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c >>> index 437e214..89bc70e 100644 >>> --- a/hw/ppc/sam460ex.c >>> +++ b/hw/ppc/sam460ex.c >>> @@ -439,7 +439,8 @@ static void sam460ex_init(MachineState *machine) >>> >>> success =3D load_elf(machine->kernel_filename, NULL, >>> NULL, NULL, &elf_entry, >>> - &elf_lowaddr, NULL, 1, PPC_ELF_MACHINE, >>> 0, >>> 0); >>> + &elf_lowaddr, NULL, NULL, 1, >>> PPC_ELF_MACHINE, 0, >>> + 0); >>> entry =3D elf_entry; >>> loadaddr =3D elf_lowaddr; >>> } >>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >>> index 02cf53f..a0076e5 100644 >>> --- a/hw/ppc/spapr.c >>> +++ b/hw/ppc/spapr.c >>> @@ -2895,13 +2895,13 @@ static void spapr_machine_init(MachineState >>> *machine) >>> >>> spapr->kernel_size =3D load_elf(kernel_filename, NULL, >>> translate_kernel_address, NULL, >>> - NULL, &lowaddr, NULL, 1, >>> + NULL, &lowaddr, NULL, NULL, 1, >>> PPC_ELF_MACHINE, 0, 0); >>> if (spapr->kernel_size =3D=3D ELF_LOAD_WRONG_ENDIAN) { >>> spapr->kernel_size =3D load_elf(kernel_filename, NULL, >>> translate_kernel_address, >>> NULL, >>> NULL, >>> - &lowaddr, NULL, 0, >>> PPC_ELF_MACHINE, >>> - 0, 0); >>> + &lowaddr, NULL, NULL, 0, >>> + PPC_ELF_MACHINE, 0, 0); >>> spapr->kernel_le =3D spapr->kernel_size > 0; >>> } >>> if (spapr->kernel_size < 0) { >>> diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c >>> index 6862552..7526947 100644 >>> --- a/hw/ppc/virtex_ml507.c >>> +++ b/hw/ppc/virtex_ml507.c >>> @@ -259,7 +259,7 @@ static void virtex_init(MachineState *machine) >>> >>> /* Boots a kernel elf binary. */ >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &entry, &low, &high, 1, PPC_ELF_MACHINE= , >>> + &entry, &low, &high, NULL, 1, >>> PPC_ELF_MACHINE, >>> 0, 0); >>> boot_info.bootstrap_pc =3D entry & 0x00ffffff; >>> >>> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c >>> index 027303d..b8e7652 100644 >>> --- a/hw/riscv/boot.c >>> +++ b/hw/riscv/boot.c >>> @@ -101,7 +101,7 @@ target_ulong riscv_load_firmware(const char >>> *firmware_filename, >>> uint64_t firmware_entry, firmware_start, firmware_end; >>> >>> if (load_elf(firmware_filename, NULL, NULL, NULL, &firmware_entry, >>> - &firmware_start, &firmware_end, 0, EM_RISCV, 1, 0) > >>> 0) { >>> + &firmware_start, &firmware_end, NULL, 0, EM_RISCV, 1, >>> 0) >>> >>>> 0) { >>>> >>> return firmware_entry; >>> } >>> >>> @@ -119,7 +119,7 @@ target_ulong riscv_load_kernel(const char >>> *kernel_filename, symbol_fn_t sym_cb) >>> uint64_t kernel_entry, kernel_high; >>> >>> if (load_elf_ram_sym(kernel_filename, NULL, NULL, NULL, >>> - &kernel_entry, NULL, &kernel_high, 0, >>> + &kernel_entry, NULL, &kernel_high, NULL, 0, >>> EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) { >>> return kernel_entry; >>> } >>> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c >>> index ca544d6..49506e4 100644 >>> --- a/hw/s390x/ipl.c >>> +++ b/hw/s390x/ipl.c >>> @@ -139,7 +139,7 @@ static void s390_ipl_realize(DeviceState *dev, Erro= r >>> **errp) >>> >>> bios_size =3D load_elf(bios_filename, NULL, >>> bios_translate_addr, &fwbase, >>> - &ipl->bios_start_addr, NULL, NULL, 1, >>> + &ipl->bios_start_addr, NULL, NULL, NULL, = 1, >>> EM_S390, 0, 0); >>> if (bios_size > 0) { >>> /* Adjust ELF start address to final location */ >>> @@ -164,7 +164,7 @@ static void s390_ipl_realize(DeviceState *dev, Erro= r >>> **errp) >>> if (ipl->kernel) { >>> kernel_size =3D load_elf(ipl->kernel, NULL, NULL, NULL, >>> &pentry, NULL, >>> - NULL, 1, EM_S390, 0, 0); >>> + NULL, NULL, 1, EM_S390, 0, 0); >>> if (kernel_size < 0) { >>> kernel_size =3D load_image_targphys(ipl->kernel, 0, >>> ram_size); >>> if (kernel_size < 0) { >>> @@ -473,7 +473,8 @@ static int load_netboot_image(Error **errp) >>> >>> img_size =3D load_elf_ram(netboot_filename, NULL, NULL, NULL, >>> &ipl->start_addr, >>> - NULL, NULL, 1, EM_S390, 0, 0, NULL, false)= ; >>> + NULL, NULL, NULL, 1, EM_S390, 0, 0, NULL, >>> + false); >>> >>> if (img_size < 0) { >>> img_size =3D load_image_size(netboot_filename, ram_ptr, >>> ram_size); >>> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c >>> index 8038887..f5a087d 100644 >>> --- a/hw/sparc/leon3.c >>> +++ b/hw/sparc/leon3.c >>> @@ -297,7 +297,7 @@ static void leon3_generic_hw_init(MachineState >>> *machine) >>> uint64_t entry; >>> >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> - &entry, NULL, NULL, >>> + &entry, NULL, NULL, NULL, >>> 1 /* big endian */, EM_SPARC, 0, 0); >>> if (kernel_size < 0) { >>> kernel_size =3D load_uimage(kernel_filename, NULL, &entry, >>> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c >>> index 2aaa5bf..d404353 100644 >>> --- a/hw/sparc/sun4m.c >>> +++ b/hw/sparc/sun4m.c >>> @@ -270,7 +270,7 @@ static unsigned long sun4m_load_kernel(const char >>> *kernel_filename, >>> #endif >>> kernel_size =3D load_elf(kernel_filename, NULL, >>> translate_kernel_address, NULL, >>> - NULL, NULL, NULL, 1, EM_SPARC, 0, 0); >>> + NULL, NULL, NULL, NULL, 1, EM_SPARC, 0, >>> 0); >>> if (kernel_size < 0) >>> kernel_size =3D load_aout(kernel_filename, KERNEL_LOAD_ADD= R, >>> RAM_size - KERNEL_LOAD_ADDR, >>> bswap_needed, >>> @@ -721,7 +721,7 @@ static void prom_init(hwaddr addr, const char >>> *bios_name) >>> if (filename) { >>> ret =3D load_elf(filename, NULL, >>> translate_prom_address, &addr, NULL, >>> - NULL, NULL, 1, EM_SPARC, 0, 0); >>> + NULL, NULL, NULL, 1, EM_SPARC, 0, 0); >>> if (ret < 0 || ret > PROM_SIZE_MAX) { >>> ret =3D load_image_targphys(filename, addr, PROM_SIZE_MAX)= ; >>> } >>> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c >>> index 9550827..c746040 100644 >>> --- a/hw/sparc64/sun4u.c >>> +++ b/hw/sparc64/sun4u.c >>> @@ -175,7 +175,8 @@ static uint64_t sun4u_load_kernel(const char >>> *kernel_filename, >>> bswap_needed =3D 0; >>> #endif >>> kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, >>> kernel_entry, >>> - kernel_addr, &kernel_top, 1, EM_SPARCV9= , >>> 0, 0); >>> + kernel_addr, &kernel_top, NULL, 1, >>> EM_SPARCV9, 0, >>> + 0); >>> if (kernel_size < 0) { >>> *kernel_addr =3D KERNEL_LOAD_ADDR; >>> *kernel_entry =3D KERNEL_LOAD_ADDR; >>> @@ -439,7 +440,7 @@ static void prom_init(hwaddr addr, const char >>> *bios_name) >>> filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); >>> if (filename) { >>> ret =3D load_elf(filename, NULL, translate_prom_address, &addr= , >>> - NULL, NULL, NULL, 1, EM_SPARCV9, 0, 0); >>> + NULL, NULL, NULL, NULL, 1, EM_SPARCV9, 0, 0); >>> if (ret < 0 || ret > PROM_SIZE_MAX) { >>> ret =3D load_image_targphys(filename, addr, PROM_SIZE_MAX)= ; >>> } >>> diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_ >>> testboard.c >>> index aef3289..20c9ccb 100644 >>> --- a/hw/tricore/tricore_testboard.c >>> +++ b/hw/tricore/tricore_testboard.c >>> @@ -42,7 +42,7 @@ static void tricore_load_kernel(CPUTriCoreState *env) >>> >>> kernel_size =3D load_elf(tricoretb_binfo.kernel_filename, NULL, >>> NULL, NULL, &entry, NULL, >>> - NULL, 0, >>> + NULL, NULL, 0, >>> EM_TRICORE, 1, 0); >>> if (kernel_size <=3D 0) { >>> error_report("no kernel file '%s'", >>> diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c >>> index a22743a..aeb46d8 100644 >>> --- a/hw/xtensa/sim.c >>> +++ b/hw/xtensa/sim.c >>> @@ -108,7 +108,7 @@ void xtensa_sim_load_kernel(XtensaCPU *cpu, >>> MachineState *machine) >>> uint64_t elf_entry; >>> uint64_t elf_lowaddr; >>> int success =3D load_elf(kernel_filename, NULL, >>> translate_phys_addr, cpu, >>> - &elf_entry, &elf_lowaddr, NULL, >>> big_endian, >>> + &elf_entry, &elf_lowaddr, NULL, NULL, >>> big_endian, >>> EM_XTENSA, 0, 0); >>> >>> if (success > 0) { >>> diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c >>> index 8220c7a..8e2dd13 100644 >>> --- a/hw/xtensa/xtfpga.c >>> +++ b/hw/xtensa/xtfpga.c >>> @@ -415,7 +415,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *boar= d, >>> MachineState *machine) >>> uint64_t elf_entry; >>> uint64_t elf_lowaddr; >>> int success =3D load_elf(kernel_filename, NULL, >>> translate_phys_addr, cpu, >>> - &elf_entry, &elf_lowaddr, NULL, be, EM_XTENSA, 0, 0); >>> + &elf_entry, &elf_lowaddr, NULL, NULL, be, EM_XTENSA, 0= , >>> 0); >>> if (success > 0) { >>> entry_point =3D elf_entry; >>> } else { >>> diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h >>> index e07d276..a1411bf 100644 >>> --- a/include/hw/elf_ops.h >>> +++ b/include/hw/elf_ops.h >>> @@ -316,7 +316,8 @@ static int glue(load_elf, SZ)(const char *name, int >>> fd, >>> void *translate_opaque, >>> int must_swab, uint64_t *pentry, >>> uint64_t *lowaddr, uint64_t *highaddr, >>> - int elf_machine, int clear_lsb, int >>> data_swab, >>> + uint32_t *pflags, int elf_machine, >>> + int clear_lsb, int data_swab, >>> AddressSpace *as, bool load_rom, >>> symbol_fn_t sym_cb) >>> { >>> @@ -389,6 +390,9 @@ static int glue(load_elf, SZ)(const char *name, int >>> fd, >>> } >>> } >>> >>> + if (pflags) { >>> + *pflags =3D (elf_word)ehdr.e_flags; >>> + } >>> if (pentry) >>> *pentry =3D (uint64_t)(elf_sword)ehdr.e_entry; >>> >>> diff --git a/include/hw/loader.h b/include/hw/loader.h >>> index 48a96cd..a9eeea3 100644 >>> --- a/include/hw/loader.h >>> +++ b/include/hw/loader.h >>> @@ -101,6 +101,7 @@ const char *load_elf_strerror(int error); >>> * @pentry: Populated with program entry point. Ignored if NULL. >>> * @lowaddr: Populated with lowest loaded address. Ignored if NULL. >>> * @highaddr: Populated with highest loaded address. Ignored if NULL. >>> + * @pflags: Populated with ELF processor-specific flags. Ignore if NUL= L. >>> * @bigendian: Expected ELF endianness. 0 for LE otherwise BE >>> * @elf_machine: Expected ELF machine type >>> * @clear_lsb: Set to mask off LSB of addresses (Some architectures us= e >>> @@ -131,8 +132,9 @@ int load_elf_ram_sym(const char *filename, >>> uint64_t (*elf_note_fn)(void *, void *, bool), >>> uint64_t (*translate_fn)(void *, uint64_t), >>> void *translate_opaque, uint64_t *pentry, >>> - uint64_t *lowaddr, uint64_t *highaddr, int >>> big_endian, >>> - int elf_machine, int clear_lsb, int data_swab, >>> + uint64_t *lowaddr, uint64_t *highaddr, uint32_t >>> *pflags, >>> + int big_endian, int elf_machine, >>> + int clear_lsb, int data_swab, >>> AddressSpace *as, bool load_rom, symbol_fn_t >>> sym_cb); >>> >>> /** load_elf_ram: >>> @@ -143,9 +145,9 @@ int load_elf_ram(const char *filename, >>> uint64_t (*elf_note_fn)(void *, void *, bool), >>> uint64_t (*translate_fn)(void *, uint64_t), >>> void *translate_opaque, uint64_t *pentry, uint64_t >>> *lowaddr, >>> - uint64_t *highaddr, int big_endian, int elf_machine, >>> - int clear_lsb, int data_swab, AddressSpace *as, >>> - bool load_rom); >>> + uint64_t *highaddr, uint32_t *pflags, int big_endian, >>> + int elf_machine, int clear_lsb, int data_swab, >>> + AddressSpace *as, bool load_rom); >>> >>> /** load_elf_as: >>> * Same as load_elf_ram(), but always loads the elf as ROM >>> @@ -154,8 +156,9 @@ int load_elf_as(const char *filename, >>> uint64_t (*elf_note_fn)(void *, void *, bool), >>> uint64_t (*translate_fn)(void *, uint64_t), >>> void *translate_opaque, uint64_t *pentry, uint64_t >>> *lowaddr, >>> - uint64_t *highaddr, int big_endian, int elf_machine, >>> - int clear_lsb, int data_swab, AddressSpace *as); >>> + uint64_t *highaddr, uint32_t *pflags, int big_endian, >>> + int elf_machine, int clear_lsb, int data_swab, >>> + AddressSpace *as); >>> >>> /** load_elf: >>> * Same as load_elf_as(), but doesn't allow the caller to specify an >>> @@ -165,8 +168,8 @@ int load_elf(const char *filename, >>> uint64_t (*elf_note_fn)(void *, void *, bool), >>> uint64_t (*translate_fn)(void *, uint64_t), >>> void *translate_opaque, uint64_t *pentry, uint64_t >>> *lowaddr, >>> - uint64_t *highaddr, int big_endian, int elf_machine, >>> - int clear_lsb, int data_swab); >>> + uint64_t *highaddr, uint32_t *pflags, int big_endian, >>> + int elf_machine, int clear_lsb, int data_swab); >>> >>> /** load_elf_hdr: >>> * @filename: Path of ELF file >>> -- >>> 2.7.4 >>> >>> >>> >>> --000000000000dc5dae059d333090 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

On Tuesday, January 28, 2020, BALATON Zoltan <balaton@eik.bme.hu> wrote:
On Tue, 28 Jan 2020, Aleksandar Markovic wrote:
On Sunday, January 26, 2020, Aleksandar Markovic <
aleksand= ar.markovic@rt-rk.com> wrote:

From: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>

Some platforms (like AVR) need to determine cpu type by reading
the ELF flags (field e_flags oin ELF header).

This patch enables discovery of the content of that flag while
using following functions:

=C2=A0 - load_elf()
=C2=A0 - load_elf_as()
=C2=A0 - load_elf_ram()
=C2=A0 - load_elf_ram_sym()

The added argument of these functions is of type uint32_t*. It is
allowed to pass NULL as that argument, and in such case no lookup
to the field e_flags will happen, and of course, no information
will be returned to the caller.


We plan to use this new functionality for MIPS Malta board, for detection of incompatible cpu/kernel combinations, and graceful exit (right now these=
combinations result in hang or crash). I would say other boards could make<= br> use of it too.

For that reason, if there is no objection, I plan to select this patch for<= br> next MIPS queue.

No objection but kind of d=C3=A9j=C3=A0 vu:

https://lists.nongnu.org/archive/html/qemu-d= evel/2019-01/msg03427.html

I still think the interface of load_elf may need to be rethinked but I don&= #39;t know a good way.


Perhaps having only two, "in" and &q= uot;out", arguments that are pointers to structures?

Another thing that I noticed is "endian argument" that it= seems everyone uses in a different way: 0, 1, true, false, bigendian, etc.= Would c enumeration help? This looks to me like a time ticking bomb.
=

Just to add that some platforms like MIPS and SPARC mus= t load elfs of more than one value of EM_MACHINE (in MIPS case, EM_MIPS and= EM_NANOMIPS) and current load_elf() interface offers only clumsy solutions= /workarounds in these cases.

Let's think about= everything later on.

=C2=A0This could be fixed in = a later patch causing more code churn again though, so if there's a way= to fix this it might be a good opportunity now. But I don't want to ho= ld your patch series back so unless someone has a good idea to avoid this s= ituation then we have to live with it.


Thank you. I will do some minor correc= tions for obvious unclarities and typos in the commit message while applyin= g to my qieue.
=C2=A0
Regards,
BALATON Zoltan


Regards,
Aleksandar




CC: Richard Henderson <rth@twiddle.net>
CC: Peter Maydell <peter.maydell@linaro.org>
CC: Edgar E. Iglesias <edgar.iglesias@gmail.com>
CC: Michael Walle <michael@walle.cc>
CC: Thomas Huth <huth@tuxfamily.org>
CC: Laurent Vivier <laurent@vivier.eu>
CC: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
CC: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>
CC: Aurelien Jarno <aurelien@aurel32.net>
CC: Jia Liu <prolj= c@gmail.com>
CC: David Gibson <david@gibson.dropbear.id.au>
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: BALATON Zoltan <balaton@eik.bme.hu>
CC: Christian Borntraeger <borntraeger@de.ibm.com>
CC: Thomas Huth <t= huth@redhat.com>
CC: Artyom Tarasenko <atar4qemu@gmail.com>
CC: Fabien Chouteau <chouteau@adacore.com>
CC: KONRAD Frederic <frederic.konrad@adacore.com>
CC: Max Filippov <jcmvbkbc@gmail.com>

Signed-off-by: Michael Rolnik <mrolnik@gmail.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
[PMD: Extracted from bigger patch,
=C2=A0 =C2=A0 =C2=A0 Replaced 'uint32_t *pe_flags' by 'int proc= _flags']
[AM: Replaced 'int proc_flags' with 'uint32_t *pflags',
=C2=A0 =C2=A0 =C2=A0replaced one instance of 'elf_sword' to 'el= f_word',
=C2=A0 =C2=A0 =C2=A0extended functionality to load_elf()]
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Signed-off-by: Aleksandar Markovic <aleksandar.m.mail@gmail.com>
---
=C2=A0hw/alpha/dp264.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 4 ++--
=C2=A0hw/arm/armv7m.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 2 +-
=C2=A0hw/arm/boot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 2 +-
=C2=A0hw/core/generic-loader.c=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0hw/core/loader.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 37 +++++++++++++++++++------------------
=C2=A0hw/cris/boot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 2 +-
=C2=A0hw/hppa/machine.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |= =C2=A0 4 ++--
=C2=A0hw/i386/multiboot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 = 2 +-
=C2=A0hw/i386/x86.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 2 +-
=C2=A0hw/lm32/lm32_boards.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 4 ++-= -
=C2=A0hw/lm32/milkymist.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 = 2 +-
=C2=A0hw/m68k/an5206.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 2 +-
=C2=A0hw/m68k/mcf5208.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |= =C2=A0 2 +-
=C2=A0hw/m68k/q800.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 2 +-
=C2=A0hw/microblaze/boot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 = 4 ++--
=C2=A0hw/mips/mips_fulong2e.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-
=C2=A0hw/mips/mips_malta.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 = 3 ++-
=C2=A0hw/mips/mips_mipssim.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-<= br> =C2=A0hw/mips/mips_r4k.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|= =C2=A0 2 +-
=C2=A0hw/moxie/moxiesim.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 = 2 +-
=C2=A0hw/nios2/boot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 4 ++--
=C2=A0hw/openrisc/openrisc_sim.c=C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0hw/pci-host/prep.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|= =C2=A0 3 ++-
=C2=A0hw/ppc/e500.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 |=C2=A0 2 +-
=C2=A0hw/ppc/mac_newworld.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 4 ++-= -
=C2=A0hw/ppc/mac_oldworld.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 4 ++-= -
=C2=A0hw/ppc/ppc440_bamboo.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-<= br> =C2=A0hw/ppc/sam460ex.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |= =C2=A0 3 ++-
=C2=A0hw/ppc/spapr.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 6 +++---
=C2=A0hw/ppc/virtex_ml507.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-<= br> =C2=A0hw/riscv/boot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 4 ++--
=C2=A0hw/s390x/ipl.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0|=C2=A0 7 ++++---
=C2=A0hw/sparc/leon3.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 2 +-
=C2=A0hw/sparc/sun4m.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 4 ++--
=C2=A0hw/sparc64/sun4u.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|= =C2=A0 5 +++--
=C2=A0hw/tricore/tricore_testboard.c |=C2=A0 2 +-
=C2=A0hw/xtensa/sim.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 2 +-
=C2=A0hw/xtensa/xtfpga.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|= =C2=A0 2 +-
=C2=A0include/hw/elf_ops.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 = 6 +++++-
=C2=A0include/hw/loader.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 21 +++= +++++++++---------
=C2=A040 files changed, 92 insertions(+), 79 deletions(-)

diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index f2026fd..a8f9a89 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -115,7 +115,7 @@ static void clipper_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exit(1);
=C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0size =3D load_elf(palcode_filename, NULL, cpu_alpha_sup= erpage_to_phys,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL= , &palcode_entry, &palcode_low, &palcode_high,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL= , &palcode_entry, &palcode_low, &palcode_high,
NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A00, EM_ALPHA, 0, 0);
=C2=A0 =C2=A0 =C2=A0if (size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_report("could not load palcode= '%s'", palcode_filename);
@@ -134,7 +134,7 @@ static void clipper_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t param_offset;

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0size =3D load_elf(kernel_filename, NULL,<= br> cpu_alpha_superpage_to_phys,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 NULL, &kernel_entry, &kernel_low, &kernel_high,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 NULL, &kernel_entry, &kernel_low, &kernel_high,
NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A00, EM_ALPHA, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_report("could no= t load kernel '%s'", kernel_filename);
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 7a3c48f..e4fc9a8 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -331,7 +331,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char
*kernel_filename, int mem_size)

=C2=A0 =C2=A0 =C2=A0if (kernel_filename) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0image_size =3D load_elf_as(kernel_filenam= e, NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, &lowaddr,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, &lowaddr, NULL= ,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL, big_endian, EM_ARM, 1, = 0, as);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (image_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0image_size =3D load_image_t= argphys_as(kernel_filename, 0,
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 8fb4a63..0c213ca 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -903,7 +903,7 @@ static int64_t arm_load_elf(struct arm_boot_info
*info, uint64_t *pentry,
=C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0ret =3D load_elf_as(info->kernel_filename, NULL= , NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 pentry, lowaddr, highaddr, big_endian, elf_machine,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 pentry, lowaddr, highaddr, NULL, big_endian,
elf_machine,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A01, data_swab, as);
=C2=A0 =C2=A0 =C2=A0if (ret <=3D 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* The header loaded but the image didn&#= 39;t */
diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 4b1fc86..1e5ccb7 100644
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -140,7 +140,7 @@ static void generic_loader_realize(DeviceState *de= v,
Error **errp)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (!s->force_raw) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0size =3D load_elf_as(s->= file, NULL, NULL, NULL, &entry, NULL,
NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0big_endian, 0, 0, 0, as);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, big_endian, 0, 0, 0, as);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0size =3D load= _uimage_as(s->file, &entry, NULL, NULL, NULL,
NULL,
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 5099f27..d1b78f6 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -406,12 +406,12 @@ int load_elf(const char *filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t (*elf_note_fn)(vo= id *, void *, bool),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t (*translate_fn)(v= oid *, uint64_t),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 void *translate_opaque, ui= nt64_t *pentry, uint64_t *lowaddr,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *highaddr, int bi= g_endian, int elf_machine,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int clear_lsb, int data_sw= ab)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *highaddr, uint32= _t *pflags, int big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int elf_machine, int clear= _lsb, int data_swab)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0return load_elf_as(filename, elf_note_fn, translate_fn,=
translate_opaque,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0pentry, lowaddr, highaddr, big_endian, elf_machine,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0clear_lsb, data_swab, NULL);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0pentry, lowaddr, highaddr, pflags, big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0elf_machine, clear_lsb, data_swab, NULL);
=C2=A0}

=C2=A0/* return < 0 if error, otherwise the number of bytes loaded in me= mory */
@@ -419,12 +419,12 @@ int load_elf_as(const char *filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t (*el= f_note_fn)(void *, void *, bool),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t (*tr= anslate_fn)(void *, uint64_t),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0void *transla= te_opaque, uint64_t *pentry, uint64_t
*lowaddr,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t *highaddr= , int big_endian, int elf_machine,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 int clear_lsb, int= data_swab, AddressSpace *as)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t *highaddr= , uint32_t *pflags, int big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 int elf_machine, i= nt clear_lsb, int data_swab,
AddressSpace *as)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0return load_elf_ram(filename, elf_note_fn, translate_fn= ,
translate_opaque,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 pentry, lowaddr, highaddr, big_endian,
elf_machine,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 clear_lsb, data_swab, as, true);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 pentry, lowaddr, highaddr, pflags, big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 elf_machine, clear_lsb, data_swab, as, true);
=C2=A0}

=C2=A0/* return < 0 if error, otherwise the number of bytes loaded in me= mory */
@@ -432,13 +432,13 @@ int load_elf_ram(const char *filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t (*e= lf_note_fn)(void *, void *, bool),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t (*t= ranslate_fn)(void *, uint64_t),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 void *transl= ate_opaque, uint64_t *pentry, uint64_t
*lowaddr,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *hi= ghaddr, int big_endian, int elf_machine,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int clear_ls= b, int data_swab, AddressSpace *as,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bool load_ro= m)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *hi= ghaddr, uint32_t *pflags, int big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int elf_mach= ine, int clear_lsb, int data_swab,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0AddressSpace= *as, bool load_rom)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0return load_elf_ram_sym(filename, elf_note_fn,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0translate_fn, translate_opaque,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 pentry, lowaddr, highaddr, big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 pentry, lowaddr, highaddr, pflags, big_endian,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0elf_machine, clear_lsb, data_swab, as,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0load_rom, NULL);
=C2=A0}
@@ -448,8 +448,9 @@ int load_elf_ram_sym(const char *filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 uint64_t (*elf_note_fn)(void *, void *, bool),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 uint64_t (*translate_fn)(void *, uint64_t),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 void *translate_opaque, uint64_t *pentry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0uint64_t *lowaddr, uint64_t *highaddr, int
big_endian,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0int elf_machine, int clear_lsb, int data_swab,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0uint64_t *lowaddr, uint64_t *highaddr, uint32_t
*pflags,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0int big_endian, int elf_machine,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0int clear_lsb, int data_swab,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 AddressSpace *as, bool load_rom, symbol_fn_t sym_cb)
=C2=A0{
=C2=A0 =C2=A0 =C2=A0int fd, data_order, target_data_order, must_swab, ret = =3D
ELF_LOAD_FAILED;
@@ -490,13 +491,13 @@ int load_elf_ram_sym(const char *filename,
=C2=A0 =C2=A0 =C2=A0if (e_ident[EI_CLASS] =3D=3D ELFCLASS64) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D load_elf64(filename, fd, elf_note= _fn,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 translate_fn, translate_opaque, must_swab,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0pentry, lowaddr, highaddr, elf_machine,
clear_lsb,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0data_swab, as, load_rom, sym_cb);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0pentry, lowaddr, highaddr, pflags, elf_machine,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0clear_lsb, data_swab, as, load_rom, sym_cb);
=C2=A0 =C2=A0 =C2=A0} else {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D load_elf32(filename, fd, elf_note= _fn,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 translate_fn, translate_opaque, must_swab,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0pentry, lowaddr, highaddr, elf_machine,
clear_lsb,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0data_swab, as, load_rom, sym_cb);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0pentry, lowaddr, highaddr, pflags, elf_machine,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0clear_lsb, data_swab, as, load_rom, sym_cb);
=C2=A0 =C2=A0 =C2=A0}

=C2=A0 fail:
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index 2d2cc0c..b8947bc 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -76,7 +76,7 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info<= br> *li)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 devboard SDK.=C2=A0 */
=C2=A0 =C2=A0 =C2=A0image_size =3D load_elf(li->image_filename, NULL, =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0translate_kernel_address, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 &entry, NULL, &high, 0, EM_CRIS, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 &entry, NULL, &high, NULL, 0, EM_CRIS, 0, 0);
=C2=A0 =C2=A0 =C2=A0li->entry =3D entry;
=C2=A0 =C2=A0 =C2=A0if (image_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Takes a kimage from the axis devboard = SDK.=C2=A0 */
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 5d0de26..0ab36cf 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -140,7 +140,7 @@ static void machine_hppa_init(MachineState *machine) =C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0size =3D load_elf(firmware_filename, NULL, NULL, NULL,<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &= ;firmware_entry, &firmware_low, &firmware_high,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &= ;firmware_entry, &firmware_low, &firmware_high, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0true, EM_PARISC, 0, 0);

=C2=A0 =C2=A0 =C2=A0/* Unfortunately, load_elf sign-extends reading elf32.= =C2=A0 */
@@ -169,7 +169,7 @@ static void machine_hppa_init(MachineState *machine) =C2=A0 =C2=A0 =C2=A0/* Load kernel */
=C2=A0 =C2=A0 =C2=A0if (kernel_filename) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0size =3D load_elf(kernel_filename, NULL, = &cpu_hppa_to_phys,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 NULL, &kernel_entry, &kernel_low, &kernel_high,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 NULL, &kernel_entry, &kernel_low, &kernel_high,
NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0true, EM_PARISC, 0, 0);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Unfortunately, load_elf sign-extends r= eading elf32.=C2=A0 */
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 9a59f95..9e7d69d 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -199,7 +199,7 @@ int load_multiboot(FWCfgState *fw_cfg,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
&elf_entry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_low, &elf_high, 0, I386_= ELF_MACHINE,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_low, &elf_high, NULL, 0,=
I386_ELF_MACHINE,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_report("Error wh= ile loading elf kernel");
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 9b9a4d5..7f38e6b 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -413,7 +413,7 @@ static bool load_elfboot(const char *kernel_filename, =C2=A0 =C2=A0 =C2=A0uint64_t elf_note_type =3D XEN_ELFNOTE_PHYS32_ENTRY; =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename, read_pvh_star= t_addr,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 NULL, &elf_note_type, &elf_entry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0&elf_low, &elf_high, 0, I386_ELF_MACHINE, +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0&elf_low, &elf_high, NULL, 0, I386_ELF_MACH= INE,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 0, 0);

=C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index 5ae308b..d1894ad 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -138,7 +138,7 @@ static void lm32_evr_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int kernel_size;

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1, EM_LATTICEMICO32, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0reset_info->bootstrap_pc =3D entry;
@@ -232,7 +232,7 @@ static void lm32_uclinux_init(MachineState *machine) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int kernel_size;

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1, EM_LATTICEMICO32, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0reset_info->bootstrap_pc =3D entry;
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 460d322..6d46134 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -177,7 +177,7 @@ milkymist_init(MachineState *machine)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Boots a kernel elf binary.=C2=A0 */ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1, EM_LATTICEMICO32, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0reset_info->bootstrap_pc =3D entry;
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 54ccbe1..bed43a9 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -65,7 +65,7 @@ static void an5206_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename, NULL, NULL, N= ULL, &elf_entry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, 1, EM_68K, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, NULL, 1, EM_68K, 0, 0);
=C2=A0 =C2=A0 =C2=A0entry =3D elf_entry;
=C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_uimage(kernel_filena= me, &entry, NULL, NULL,
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 158c5e4..a999c21 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -329,7 +329,7 @@ static void mcf5208evb_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename, NULL, NULL, N= ULL, &elf_entry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, 1, EM_68K, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, NULL, 1, EM_68K, 0, 0);
=C2=A0 =C2=A0 =C2=A0entry =3D elf_entry;
=C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_uimage(kernel_filena= me, &entry, NULL, NULL,
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 12491ec..1e32363 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -342,7 +342,7 @@ static void q800_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0if (linux_boot) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t high;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_entry, NULL, &high, 1, +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_entry, NULL, &high, NULL= , 1,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 EM_68K, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_report("could no= t load kernel '%s'", kernel_filename);
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index d1d7dfb..925e3f7 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -145,13 +145,13 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu,<= br> hwaddr ddr_base,

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Boots a kernel elf binary.=C2=A0 */ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, &low, &high,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, &low, &high, NULL= ,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 big_endian, EM_MICROBLAZE, 0, 0); =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0base32 =3D entry;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (base32 =3D=3D 0xc0000000) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(ke= rnel_filename, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 translate_kernel_addre= ss, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL,=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL,= NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 big_endian, EM_MICROBL= AZE, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Always boot into physical ram.=C2=A0 *= /
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 9eaa6e2..2e043cb 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -119,7 +119,7 @@ static int64_t load_kernel(CPUMIPSState *env)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 cpu_mips_kseg0_to_phys, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (uint64_t *)&kernel_entry,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (uint64_t *)&kernel_low, (uint64_t
*)&kernel_high,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A00, EM_MIPS, 1, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0NULL, 0, EM_MIPS, 1, 0);
=C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_report("could not load kernel = '%s': %s",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 loaderparams.kernel_filename,
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 5aaeaa8..34b76bb 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1039,7 +1039,8 @@ static int64_t load_kernel(void)
=C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(loaderparams.kernel_filen= ame, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 cpu_mips_kseg0_to_phys, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (uint64_t *)&kernel_entry, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(uint64_t *)&kernel_high, big_endian, EM_MIPS,<= br> 1, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(uint64_t *)&kernel_high, NULL, big_endian,
EM_MIPS,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A01, 0);
=C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_report("could not load kernel = '%s': %s",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 loaderparams.kernel_filename,
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 84c03dd..b934ca9 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -74,7 +74,7 @@ static int64_t load_kernel(void)
=C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(loaderparams.kernel_filen= ame, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 cpu_mips_kseg0_to_phys, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (uint64_t *)&entry, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(uint64_t *)&kernel_high, big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(uint64_t *)&kernel_high, NULL, big_endian,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 EM_MIPS, 1, 0);
=C2=A0 =C2=A0 =C2=A0if (kernel_size >=3D 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if ((entry & ~0x7fffffffULL) =3D=3D 0= x80000000) {
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index fd926a3..b2aec43 100644
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -98,7 +98,7 @@ static int64_t load_kernel(void)
=C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(loaderparams.kernel_filen= ame, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 cpu_mips_kseg0_to_phys, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (uint64_t *)&entry, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(uint64_t *)&kernel_high, big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(uint64_t *)&kernel_high, NULL, big_endian,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 EM_MIPS, 1, 0);
=C2=A0 =C2=A0 =C2=A0if (kernel_size >=3D 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if ((entry & ~0x7fffffffULL) =3D=3D 0= x80000000) {
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 57af1b4..1d06e39 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -58,7 +58,7 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams
*loader_params)
=C2=A0 =C2=A0 =C2=A0ram_addr_t initrd_offset;

=C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(loader_params->kernel_= filename,=C2=A0 NULL, NULL,
NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0&entry, &kernel_low, &kernel_high, 1, E= M_MOXIE,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0&entry, &kernel_low, &kernel_high, NULL= , 1,
EM_MOXIE,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 0, 0);

=C2=A0 =C2=A0 =C2=A0if (kernel_size <=3D 0) {
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index d78bc9e..46b8349 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -147,7 +147,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,<= br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Boots a kernel elf binary. */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, &low, &high,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, &low, &high, NULL= ,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 big_endian, EM_ALTERA_NIOS2, 0, 0);<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if ((uint32_t)entry =3D=3D 0xc0000000) {<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/*
@@ -158,7 +158,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(ke= rnel_filename, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 translate_kernel_addre= ss, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL,=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL,= NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 big_endian, EM_ALTERA_= NIOS2, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0boot_info.bootstrap_pc =3D = ddr_base + 0xc0000000 +
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(entry & = 0x07ffffff);
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 79e7049..ad53712 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -98,7 +98,7 @@ static void openrisc_load_kernel(ram_addr_t ram_size= ,

=C2=A0 =C2=A0 =C2=A0if (kernel_filename && !qtest_enabled()) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_entry, NULL, NULL, 1, EM_OPE= NRISC,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_entry, NULL, NULL, NULL, 1,<= br> EM_OPENRISC,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0entry =3D elf_entry;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index afa136d..fcf6235 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) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (filename) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (s->elf_machine !=3D = EM_NONE) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bios_size =3D= load_elf(filename, NULL, NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, 1, s= ->elf_machine, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, NULL= , 1, s->elf_machine,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (bios_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bios_size =3D= get_image_size(filename);
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 12b6a5b..886442e 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -1049,7 +1049,7 @@ void ppce500_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, p= ayload_name);

=C2=A0 =C2=A0 =C2=A0payload_size =3D load_elf(filename, NULL, NULL, NULL, -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 &bios_entry, &loadaddr, NULL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 &bios_entry, &loadaddr, NULL, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A01, PPC_ELF_MACHINE, 0, 0);
=C2=A0 =C2=A0 =C2=A0if (payload_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/*
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 3594517..464d012 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -168,7 +168,7 @@ static void ppc_core99_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0/* Load OpenBIOS (ELF) */
=C2=A0 =C2=A0 =C2=A0if (filename) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bios_size =3D load_elf(filename, NULL, NU= LL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);=

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0g_free(filename);
=C2=A0 =C2=A0 =C2=A0} else {
@@ -192,7 +192,7 @@ static void ppc_core99_init(MachineState *machine)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 translate_kernel_address, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, &lowaddr, NULL, 1, PPC_ELF_= MACHINE,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, &lowaddr, NULL, NULL, 1, PPC_ELF_MACHINE,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_aout(k= ernel_filename, kernel_base,
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 0fa680b..7318d7e 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -143,7 +143,7 @@ static void ppc_heathrow_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0/* Load OpenBIOS (ELF) */
=C2=A0 =C2=A0 =C2=A0if (filename) {
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 bios_size =3D load_elf(filename, NULL, 0, NULL= , NULL, NULL, NULL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 bios_size =3D load_elf(filename, NULL, 0, NULL= , NULL, NULL, NULL,
NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1, PPC_ELF_MACHINE, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0g_free(filename);
=C2=A0 =C2=A0 =C2=A0} else {
@@ -166,7 +166,7 @@ static void ppc_heathrow_init(MachineState *machine) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_base =3D KERNEL_LOAD_ADDR;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 translate_kernel_address, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, &lowaddr, NULL, 1, PPC_ELF_= MACHINE,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, &lowaddr, NULL, NULL, 1, PPC_ELF_MACHINE,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_aout(k= ernel_filename, kernel_base,
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index b782641..da777ef 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -253,7 +253,7 @@ static void bamboo_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (success < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0success =3D load_elf(kernel= _filename, NULL, NULL, NULL,
&elf_entry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_lowaddr, NULL, 1, PPC_ELF_MA= CHINE,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_lowaddr, NULL, NULL, 1,
PPC_ELF_MACHINE,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0entry =3D elf_entry;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0loadaddr =3D elf_lowaddr; diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 437e214..89bc70e 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -439,7 +439,8 @@ static void sam460ex_init(MachineState *machine)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0success =3D load_elf(machin= e->kernel_filename, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL, NULL, &elf_entry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_lowaddr, NULL, 1, PPC_ELF_MA= CHINE, 0,
0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_lowaddr, NULL, NULL, 1,
PPC_ELF_MACHINE, 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0entry =3D elf_entry;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0loadaddr =3D elf_lowaddr; =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 02cf53f..a0076e5 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2895,13 +2895,13 @@ static void spapr_machine_init(MachineState *machine)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0spapr->kernel_size =3D load_elf(kernel= _filename, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0translate= _kernel_address, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL, &lowa= ddr, NULL, 1,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 NULL, &lowa= ddr, NULL, NULL, 1,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0PPC_ELF_M= ACHINE, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (spapr->kernel_size =3D=3D ELF_LOAD= _WRONG_ENDIAN) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0spapr->kernel_size =3D l= oad_elf(kernel_filename, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0translate_kernel_address, NULL,
NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &= amp;lowaddr, NULL, 0,
PPC_ELF_MACHINE,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0= , 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &= amp;lowaddr, NULL, NULL, 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 P= PC_ELF_MACHINE, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0spapr->kernel_le =3D spa= pr->kernel_size > 0;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (spapr->kernel_size < 0) {
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 6862552..7526947 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -259,7 +259,7 @@ static void virtex_init(MachineState *machine)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Boots a kernel elf binary.=C2=A0 */ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, &low, &high, 1, P= PC_ELF_MACHINE,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, &low, &high, NULL= , 1,
PPC_ELF_MACHINE,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0boot_info.bootstrap_pc =3D entry & 0x= 00ffffff;

diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 027303d..b8e7652 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -101,7 +101,7 @@ target_ulong riscv_load_firmware(const char
*firmware_filename,
=C2=A0 =C2=A0 =C2=A0uint64_t firmware_entry, firmware_start, firmware_end;<= br>
=C2=A0 =C2=A0 =C2=A0if (load_elf(firmware_filename, NULL, NULL, NULL, &= firmware_entry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&firmwar= e_start, &firmware_end, 0, EM_RISCV, 1, 0) > 0) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&firmwar= e_start, &firmware_end, NULL, 0, EM_RISCV, 1, 0)
0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return firmware_entry;
=C2=A0 =C2=A0 =C2=A0}

@@ -119,7 +119,7 @@ target_ulong riscv_load_kernel(const char
*kernel_filename, symbol_fn_t sym_cb)
=C2=A0 =C2=A0 =C2=A0uint64_t kernel_entry, kernel_high;

=C2=A0 =C2=A0 =C2=A0if (load_elf_ram_sym(kernel_filename, NULL, NULL, = NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0&kernel_entry, NULL, &kernel_high, 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0&kernel_entry, NULL, &kernel_high, NULL, 0,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return kernel_entry;
=C2=A0 =C2=A0 =C2=A0}
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index ca544d6..49506e4 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -139,7 +139,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bios_size =3D load_elf(bios_filename, NUL= L,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bios_translate_addr, &fwbase,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&ipl->bios_start_addr, NULL, NULL, 1,=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&ipl->bios_start_addr, NULL, NULL, NU= LL, 1,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 EM_S390, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (bios_size > 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Adjust ELF start address= to final location */
@@ -164,7 +164,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
=C2=A0 =C2=A0 =C2=A0if (ipl->kernel) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(ipl->kernel, = NULL, NULL, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &pentry, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, 1, EM_S390, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, 1, EM_S390, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_image_= targphys(ipl->kernel, 0, ram_size);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) { @@ -473,7 +473,8 @@ static int load_netboot_image(Error **errp)

=C2=A0 =C2=A0 =C2=A0img_size =3D load_elf_ram(netboot_filename, NULL, NULL,= NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&ipl->start_addr,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 NULL, NULL, 1, EM_S390, 0, 0, NULL, false);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 NULL, NULL, NULL, 1, EM_S390, 0, 0, NULL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 false);

=C2=A0 =C2=A0 =C2=A0if (img_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0img_size =3D load_image_size(netboot_file= name, ram_ptr, ram_size);
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 8038887..f5a087d 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -297,7 +297,7 @@ static void leon3_generic_hw_init(MachineState
*machine)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t entry;

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&entry, NULL, NULL, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1 /* big endian */, EM_SPARC, 0, 0);=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_uimage= (kernel_filename, NULL, &entry,
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 2aaa5bf..d404353 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -270,7 +270,7 @@ static unsigned long sun4m_load_kernel(const char
*kernel_filename,
=C2=A0#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 translate_kernel_address, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, NULL, 1, EM_SPARC, 0, 0);=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, NULL, NULL, 1, EM_SPARC, = 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_aout(k= ernel_filename, KERNEL_LOAD_ADDR,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0RAM_size - KERNE= L_LOAD_ADDR,
bswap_needed,
@@ -721,7 +721,7 @@ static void prom_init(hwaddr addr, const char
*bios_name)
=C2=A0 =C2=A0 =C2=A0if (filename) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D load_elf(filename, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 translate_prom_address, &addr, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0NULL, NULL, 1, EM_SPARC, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0NULL, NULL, NULL, 1, EM_SPARC, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (ret < 0 || ret > PROM_SIZE_MAX)= {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D load_image_targphys= (filename, addr, PROM_SIZE_MAX);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 9550827..c746040 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -175,7 +175,8 @@ static uint64_t sun4u_load_kernel(const char
*kernel_filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bswap_needed =3D 0;
=C2=A0#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(kernel_filename,= NULL, NULL, NULL,
kernel_entry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_addr, &kernel_top, 1, EM_S= PARCV9,
0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kernel_addr, &kernel_top, NULL, 1= ,
EM_SPARCV9, 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (kernel_size < 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*kernel_addr =3D KERNEL_LOA= D_ADDR;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*kernel_entry =3D KERNEL_LO= AD_ADDR;
@@ -439,7 +440,7 @@ static void prom_init(hwaddr addr, const char
*bios_name)
=C2=A0 =C2=A0 =C2=A0filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, b= ios_name);
=C2=A0 =C2=A0 =C2=A0if (filename) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D load_elf(filename, NULL, translat= e_prom_address, &addr,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0NULL, NULL, NULL, 1, EM_SPARCV9, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0NULL, NULL, NULL, NULL, 1, EM_SPARCV9, 0, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (ret < 0 || ret > PROM_SIZE_MAX)= {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret =3D load_image_targphys= (filename, addr, PROM_SIZE_MAX);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_
testboard.c
index aef3289..20c9ccb 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -42,7 +42,7 @@ static void tricore_load_kernel(CPUTriCoreState *env= )

=C2=A0 =C2=A0 =C2=A0kernel_size =3D load_elf(tricoretb_binfo.kernel_fi= lename, NULL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 NULL, NULL, &entry, NULL,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0NULL, 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0NULL, NULL, 0,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 EM_TRICORE, 1, 0);
=C2=A0 =C2=A0 =C2=A0if (kernel_size <=3D 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0error_report("no kernel file '%s= '",
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index a22743a..aeb46d8 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -108,7 +108,7 @@ void xtensa_sim_load_kernel(XtensaCPU *cpu,
MachineState *machine)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t elf_entry;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t elf_lowaddr;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int success =3D load_elf(kernel_filename,= NULL,
translate_phys_addr, cpu,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_entry, &elf_lowaddr, NUL= L, big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&elf_entry, &elf_lowaddr, NUL= L, NULL,
big_endian,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 EM_XTENSA, 0, 0);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (success > 0) {
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 8220c7a..8e2dd13 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -415,7 +415,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t elf_entry;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t elf_lowaddr;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int success =3D load_elf(kernel_filename,= NULL,
translate_phys_addr, cpu,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &elf_entry, &a= mp;elf_lowaddr, NULL, be, EM_XTENSA, 0, 0);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 &elf_entry, &a= mp;elf_lowaddr, NULL, NULL, be, EM_XTENSA, 0,
0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (success > 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0entry_point =3D elf_entry;<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else {
diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
index e07d276..a1411bf 100644
--- a/include/hw/elf_ops.h
+++ b/include/hw/elf_ops.h
@@ -316,7 +316,8 @@ static int glue(load_elf, SZ)(const char *name, int fd,=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0void *translate_opaque,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int must_swab, uint64_t *pentry,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *lowaddr, uint64_t *highaddr= ,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 int elf_machine, int clear_lsb, int
data_swab,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint32_t *pflags, int elf_machine,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 int clear_lsb, int data_swab,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0AddressSpace *as, bool load_rom,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0symbol_fn_t sym_cb)
=C2=A0{
@@ -389,6 +390,9 @@ static int glue(load_elf, SZ)(const char *name, int fd,=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0}

+=C2=A0 =C2=A0 if (pflags) {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 *pflags =3D (elf_word)ehdr.e_flags;
+=C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0if (pentry)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*pentry =3D (uint64_t)(elf_sword)ehdr.e_e= ntry;

diff --git a/include/hw/loader.h b/include/hw/loader.h
index 48a96cd..a9eeea3 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -101,6 +101,7 @@ const char *load_elf_strerror(int error);
=C2=A0 * @pentry: Populated with program entry point. Ignored if NULL.
=C2=A0 * @lowaddr: Populated with lowest loaded address. Ignored if NULL. =C2=A0 * @highaddr: Populated with highest loaded address. Ignored if NULL.=
+ * @pflags: Populated with ELF processor-specific flags. Ignore if NULL. =C2=A0 * @bigendian: Expected ELF endianness. 0 for LE otherwise BE
=C2=A0 * @elf_machine: Expected ELF machine type
=C2=A0 * @clear_lsb: Set to mask off LSB of addresses (Some architectures u= se
@@ -131,8 +132,9 @@ int load_elf_ram_sym(const char *filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 uint64_t (*elf_note_fn)(void *, void *, bool),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 uint64_t (*translate_fn)(void *, uint64_t),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 void *translate_opaque, uint64_t *pentry,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0uint64_t *lowaddr, uint64_t *highaddr, int
big_endian,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0int elf_machine, int clear_lsb, int data_swab,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0uint64_t *lowaddr, uint64_t *highaddr, uint32_t
*pflags,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0int big_endian, int elf_machine,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0int clear_lsb, int data_swab,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 AddressSpace *as, bool load_rom, symbol_fn_t sym_cb);

=C2=A0/** load_elf_ram:
@@ -143,9 +145,9 @@ int load_elf_ram(const char *filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t (*e= lf_note_fn)(void *, void *, bool),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t (*t= ranslate_fn)(void *, uint64_t),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 void *transl= ate_opaque, uint64_t *pentry, uint64_t
*lowaddr,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *hi= ghaddr, int big_endian, int elf_machine,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int clear_ls= b, int data_swab, AddressSpace *as,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bool load_ro= m);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *hi= ghaddr, uint32_t *pflags, int big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int elf_mach= ine, int clear_lsb, int data_swab,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0AddressSpace= *as, bool load_rom);

=C2=A0/** load_elf_as:
=C2=A0 * Same as load_elf_ram(), but always loads the elf as ROM
@@ -154,8 +156,9 @@ int load_elf_as(const char *filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t (*el= f_note_fn)(void *, void *, bool),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t (*tr= anslate_fn)(void *, uint64_t),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0void *transla= te_opaque, uint64_t *pentry, uint64_t
*lowaddr,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t *highaddr= , int big_endian, int elf_machine,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 int clear_lsb, int= data_swab, AddressSpace *as);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t *highaddr= , uint32_t *pflags, int big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 int elf_machine, i= nt clear_lsb, int data_swab,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 AddressSpace *as);=

=C2=A0/** load_elf:
=C2=A0 * Same as load_elf_as(), but doesn't allow the caller to specify= an
@@ -165,8 +168,8 @@ int load_elf(const char *filename,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t (*elf_note_fn)(vo= id *, void *, bool),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t (*translate_fn)(v= oid *, uint64_t),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 void *translate_opaque, ui= nt64_t *pentry, uint64_t *lowaddr,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *highaddr, int bi= g_endian, int elf_machine,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int clear_lsb, int data_sw= ab);
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint64_t *highaddr, uint32= _t *pflags, int big_endian,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int elf_machine, int clear= _lsb, int data_swab);

=C2=A0/** load_elf_hdr:
=C2=A0 * @filename: Path of ELF file
--
2.7.4



--000000000000dc5dae059d333090--